GIT_SILENT: dont use deprecated cmake variable

master
Laurent Montel 4 years ago
parent b2d120a4dd
commit 88b6076b2f

@ -697,8 +697,8 @@ endif()
add_executable(kwin_x11 main_x11.cpp)
target_link_libraries(kwin_x11 kwin KF5::Crash Qt5::X11Extras)
install(TARGETS kwin ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
install(TARGETS kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kwin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
install(TARGETS kwin_x11 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
set(kwin_XWAYLAND_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/xwl/clipboard.cpp
@ -738,7 +738,7 @@ if (HAVE_LIBCAP)
target_link_libraries(kwin_wayland ${Libcap_LIBRARIES})
endif()
install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kwin_wayland ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
if (HAVE_LIBCAP)
install(
CODE "execute_process(

@ -1,2 +1,2 @@
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/desktop)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/desktop)

@ -1,2 +1,2 @@
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kwindecoration)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kwindecoration)

@ -1,2 +1,2 @@
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kwineffects)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kwineffects)

@ -1,2 +1,2 @@
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kwinscreenedges)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kwinscreenedges)

@ -1,2 +1,2 @@
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kwintabbox)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kwintabbox)

@ -1,2 +1,2 @@
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/windowbehaviour)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/windowbehaviour)

@ -1,2 +1,2 @@
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/windowspecific)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/windowspecific)

@ -70,7 +70,7 @@ macro(KWIN4_ADD_EFFECT name)
set_target_properties(kwin4_effect_${name} PROPERTIES VERSION 1.0.0 SOVERSION 1)
set_target_properties(kwin4_effect_${name} PROPERTIES OUTPUT_NAME ${KWIN_NAME}4_effect_${name})
install(TARGETS kwin4_effect_${name} ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kwin4_effect_${name} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
endmacro()
# Install the KWin/Effect service type

@ -19,5 +19,5 @@ install(
TARGETS
kwin_blur_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -22,5 +22,5 @@ install(
TARGETS
kwin_coverswitch_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -28,5 +28,5 @@ install(
TARGETS
kwin_cube_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -20,5 +20,5 @@ install(
TARGETS
kwin_cubeslide_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -27,5 +27,5 @@ install(
TARGETS
kwin_desktopgrid_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -19,5 +19,5 @@ install(
TARGETS
kwin_diminactive_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -20,5 +20,5 @@ install(
TARGETS
kwin_flipswitch_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -19,6 +19,6 @@ install(
TARGETS
kwin_glide_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -21,5 +21,5 @@ install(
TARGETS
kwin_invert_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -23,5 +23,5 @@ install(
TARGETS
kwin_lookingglass_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -19,5 +19,5 @@ install(
TARGETS
kwin_magiclamp_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -20,5 +20,5 @@ install(
TARGETS
kwin_magnifier_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -21,5 +21,5 @@ install(
TARGETS
kwin_mouseclick_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -21,5 +21,5 @@ install(
TARGETS
kwin_mousemark_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -25,5 +25,5 @@ install(
TARGETS
kwin_presentwindows_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -19,5 +19,5 @@ install(
TARGETS
kwin_resize_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -20,5 +20,5 @@ install(
TARGETS
kwin_showfps_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -20,5 +20,5 @@ install(
kwin_showpaint_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -19,5 +19,5 @@ install(
TARGETS
kwin_slide_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -20,5 +20,5 @@ install(
TARGETS
kwin_thumbnailaside_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -25,5 +25,5 @@ install(
TARGETS
kwin_trackmouse_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -20,5 +20,5 @@ install(
TARGETS
kwin_windowgeometry_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -19,5 +19,5 @@ install(
TARGETS
kwin_wobblywindows_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -20,5 +20,5 @@ install(
TARGETS
kwin_zoom_config
DESTINATION
${PLUGIN_INSTALL_DIR}/kwin/effects/configs
${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs
)

@ -1,3 +1,3 @@
add_executable(kwin_wayland_wrapper kwin_wrapper.c wl-socket.c)
set_property(TARGET kwin_wayland_wrapper PROPERTY C_STANDARD 11)
install(TARGETS kwin_wayland_wrapper ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kwin_wayland_wrapper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

@ -29,4 +29,4 @@ set_target_properties(kcmkwincommon PROPERTIES
SOVERSION ${PROJECT_VERSION_MAJOR}
)
install(TARGETS kcmkwincommon ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
install(TARGETS kcmkwincommon ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)

@ -33,5 +33,5 @@ target_link_libraries(kwincompositing
KF5::KCMUtils
)
install(TARGETS kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS kwincompositing DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES kwincompositing.desktop DESTINATION ${SERVICES_INSTALL_DIR})

@ -23,7 +23,7 @@ kconfig_add_kcfg_files(kcm_kwinoptions_PART_SRCS kwinoptions_kdeglobals_settings
qt5_add_dbus_interface(kcm_kwinoptions_PART_SRCS ${KWin_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface)
add_library(kcm_kwinoptions MODULE ${kcm_kwinoptions_PART_SRCS})
target_link_libraries(kcm_kwinoptions kwin Qt5::DBus KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::Service KF5::WindowSystem)
install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS kcm_kwinoptions DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############

@ -52,6 +52,6 @@ add_library(kcm_kwinrules MODULE kcmrules.cpp rulebookmodel.cpp)
target_link_libraries(kcm_kwinrules KWinRulesObjects)
kcoreaddons_desktop_to_json(kcm_kwinrules "kcm_kwinrules.desktop" SERVICE_TYPES kcmodule.desktop)
install(TARGETS kcm_kwinrules DESTINATION ${PLUGIN_INSTALL_DIR}/kcms)
install(TARGETS kcm_kwinrules DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
install(FILES kcm_kwinrules.desktop DESTINATION ${SERVICES_INSTALL_DIR})
kpackage_install_package(package kcm_kwinrules kcms)

@ -61,5 +61,5 @@ kconfig_add_kcfg_files(kcm_kwintouchscreenedges_PART_SRCS kwintouchscreensetting
add_library(kcm_kwintouchscreen MODULE ${kcm_kwintouchscreenedges_PART_SRCS})
target_link_libraries(kcm_kwintouchscreen ${X11_LIBRARIES} ${kcm_screenedges_LIBS})
install(TARGETS kcm_kwinscreenedges kcm_kwintouchscreen DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS kcm_kwinscreenedges kcm_kwintouchscreen DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES kwinscreenedges.desktop kwintouchscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR})

@ -24,6 +24,6 @@ target_link_libraries(kcm_kwin_scripts
KF5::Package
)
install(TARGETS kcm_kwin_scripts DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS kcm_kwin_scripts DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES kwinscripts.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES kwinscripts.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})

@ -36,7 +36,7 @@ target_link_libraries(kcm_kwintabbox
kwin4_effect_builtins
)
install(TARGETS kcm_kwintabbox DESTINATION ${PLUGIN_INSTALL_DIR} )
install(TARGETS kcm_kwintabbox DESTINATION ${KDE_INSTALL_PLUGINDIR} )
########### install files ###############
install(FILES kwintabbox.desktop DESTINATION ${SERVICES_INSTALL_DIR})

@ -32,7 +32,7 @@ set_target_properties(kwinxrenderutils PROPERTIES
)
set_target_properties(kwinxrenderutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}xrenderutils)
install(TARGETS kwinxrenderutils EXPORT KWinEffectsTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kwinxrenderutils EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
### effects lib ###
set(kwin_EFFECTSLIB_SRCS
@ -66,7 +66,7 @@ set_target_properties(kwineffects PROPERTIES
)
set_target_properties(kwineffects PROPERTIES OUTPUT_NAME ${KWIN_NAME}effects)
install(TARGETS kwineffects EXPORT KWinEffectsTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kwineffects EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
# kwingl(es)utils library
set(kwin_GLUTILSLIB_SRCS
@ -87,7 +87,7 @@ set_target_properties(kwinglutils PROPERTIES
OUTPUT_NAME ${KWIN_NAME}glutils
)
install(TARGETS kwinglutils EXPORT KWinEffectsTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kwinglutils EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/kwinconfig.h

@ -34,4 +34,4 @@ qt5_add_dbus_interface(colordintegration_SOURCES ${COLORD_PROFILE_XML} colordpro
add_library(colordintegration MODULE ${colordintegration_SOURCES})
set_target_properties(colordintegration PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kwin/plugins/")
target_link_libraries(colordintegration kwin)
install(TARGETS colordintegration DESTINATION ${PLUGIN_INSTALL_DIR}/kwin/plugins/)
install(TARGETS colordintegration DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/plugins/)

@ -26,7 +26,7 @@ target_link_libraries(kwin5_aurorae
Qt5::UiTools
)
install(TARGETS kwin5_aurorae DESTINATION ${PLUGIN_INSTALL_DIR}/org.kde.kdecoration2)
install(TARGETS kwin5_aurorae DESTINATION ${KDE_INSTALL_PLUGINDIR}/org.kde.kdecoration2)
set(decoration_plugin_SRCS
colorhelper.cpp

@ -8,5 +8,5 @@ qt5_add_dbus_adaptor(krunnerintegration_SOURCES org.kde.krunner1.xml windowsrunn
add_library(krunnerintegration MODULE ${krunnerintegration_SOURCES})
target_link_libraries(krunnerintegration kwin KF5::Runner)
install(TARGETS krunnerintegration DESTINATION ${PLUGIN_INSTALL_DIR}/kwin/plugins/)
install(TARGETS krunnerintegration DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/plugins/)
install(FILES kwin-runner-windows.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)

@ -28,4 +28,4 @@ target_link_libraries(KWinNightColorPlugin kwin)
install(FILES nightcolorsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} RENAME ${KWIN_NAME}_colorcorrect.kcfg)
install(FILES org.kde.kwin.ColorCorrect.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
install(TARGETS KWinNightColorPlugin DESTINATION ${PLUGIN_INSTALL_DIR}/kwin/plugins/)
install(TARGETS KWinNightColorPlugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/plugins/)

@ -42,5 +42,5 @@ install(
TARGETS
KWinWaylandDrmBackend
DESTINATION
${PLUGIN_INSTALL_DIR}/org.kde.kwin.waylandbackends/
${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.waylandbackends/
)

@ -13,5 +13,5 @@ install(
TARGETS
KWinWaylandFbdevBackend
DESTINATION
${PLUGIN_INSTALL_DIR}/org.kde.kwin.waylandbackends/
${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.waylandbackends/
)

@ -16,5 +16,5 @@ install(
TARGETS
KWinWaylandVirtualBackend
DESTINATION
${PLUGIN_INSTALL_DIR}/org.kde.kwin.waylandbackends/
${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.waylandbackends/
)

@ -27,5 +27,5 @@ install(
TARGETS
KWinWaylandWaylandBackend
DESTINATION
${PLUGIN_INSTALL_DIR}/org.kde.kwin.waylandbackends/
${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.waylandbackends/
)

@ -43,5 +43,5 @@ install(
TARGETS
KWinX11Platform
DESTINATION
${PLUGIN_INSTALL_DIR}/org.kde.kwin.platforms/
${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.platforms/
)

@ -17,5 +17,5 @@ install(
TARGETS
KWinWaylandX11Backend
DESTINATION
${PLUGIN_INSTALL_DIR}/org.kde.kwin.waylandbackends/
${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.waylandbackends/
)

@ -28,5 +28,5 @@ install(
TARGETS
KWinSceneOpenGL
DESTINATION
${PLUGIN_INSTALL_DIR}/org.kde.kwin.scenes/
${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.scenes/
)

@ -11,5 +11,5 @@ install(
TARGETS
KWinSceneQPainter
DESTINATION
${PLUGIN_INSTALL_DIR}/org.kde.kwin.scenes/
${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.scenes/
)

@ -20,5 +20,5 @@ install(
TARGETS
KWinSceneXRender
DESTINATION
${PLUGIN_INSTALL_DIR}/org.kde.kwin.scenes/
${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.scenes/
)

@ -8,4 +8,4 @@ target_link_libraries(kcm_kwin4_genericscripted
Qt5::DBus
Qt5::UiTools
)
install(TARGETS kcm_kwin4_genericscripted DESTINATION ${PLUGIN_INSTALL_DIR}/kwin/effects/configs)
install(TARGETS kcm_kwin4_genericscripted DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs)

Loading…
Cancel
Save