Skip to content

Commit

Permalink
build: remove INSTALL_TARGETS_DEFAULT_ARGS
Browse files Browse the repository at this point in the history
This variable had been renamed long ago and is since then empty. Because it
doesn't seem to have negative impact, we just remove it instead of changing it
to the new name KDE_INSTALL_TARGETS_DEFAULT_ARGS.
  • Loading branch information
romangg committed Nov 3, 2023
1 parent 6433e34 commit 2cb0994
Show file tree
Hide file tree
Showing 12 changed files with 3 additions and 45 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ target_link_libraries(kwin_x11
${XKBX11_LIBRARIES}
)

install(TARGETS kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kwin_x11)

kcoreaddons_target_static_plugins(kwin_x11 NAMESPACE "kwin/effects/plugins")

Expand All @@ -356,7 +356,7 @@ target_link_libraries(kwin_wayland
KF6::DBusAddons
)

install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kwin_wayland)
if (HAVE_LIBCAP)
install(
CODE "execute_process(
Expand Down
2 changes: 1 addition & 1 deletion kcms/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ set_target_properties(kcmkwincommon PROPERTIES
SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR}
)

install(TARGETS kcmkwincommon ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
install(TARGETS kcmkwincommon LIBRARY NAMELINK_SKIP)

set(kcm_kwin4_genericscripted_SRCS generic_scripted_config.cpp)
qt_add_dbus_interface(kcm_kwin4_genericscripted_SRCS
Expand Down
2 changes: 0 additions & 2 deletions lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,10 @@ kcoreaddons_target_static_plugins(wlroots

install(TARGETS wlroots
EXPORT wlroots-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft
)
install(EXPORT wlroots-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
6 changes: 0 additions & 6 deletions lib/base/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -155,34 +155,28 @@ set_target_properties(base-wl PROPERTIES

install(TARGETS base
EXPORT base-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/base
)
install(TARGETS base-x11
EXPORT base-x11-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/base
)
install(TARGETS base-wl
EXPORT base-wl-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/base/wl
)
install(EXPORT base-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
install(EXPORT base-x11-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
install(EXPORT base-wl-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
4 changes: 0 additions & 4 deletions lib/debug/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,24 +78,20 @@ set_target_properties(debug-wl PROPERTIES

install(TARGETS debug-common
EXPORT debug-common-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/debug
)
install(TARGETS debug-wl
EXPORT debug-wl-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/debug
)

install(EXPORT debug-common-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
install(EXPORT debug-wl-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
4 changes: 0 additions & 4 deletions lib/desktop/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,24 +106,20 @@ ecm_install_configured_files(

install(TARGETS desktop
EXPORT desktop-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/desktop
)
install(TARGETS desktop-kde
EXPORT desktop-kde-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/desktop
)

install(EXPORT desktop-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
install(EXPORT desktop-kde-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
8 changes: 0 additions & 8 deletions lib/input/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -213,37 +213,29 @@ install(

install(TARGETS input
EXPORT input-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/input
)
install(TARGETS input-x11
EXPORT input-x11-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/input
)
install(TARGETS input-wl
EXPORT input-wl-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/input
)

install(EXPORT input-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
install(EXPORT input-x11-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
install(EXPORT input-wl-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)

install(TARGETS input-x11 ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
6 changes: 0 additions & 6 deletions lib/render/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -278,35 +278,29 @@ install(DIRECTORY qml/frames/plasma DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NA

install(TARGETS render
EXPORT render-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/render
)
install(TARGETS render-x11
EXPORT render-x11-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/render
)
install(TARGETS render-wl
EXPORT render-wl-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/render
)

install(EXPORT render-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
install(EXPORT render-x11-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
install(EXPORT render-wl-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
2 changes: 0 additions & 2 deletions lib/script/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,10 @@ set_target_properties(script PROPERTIES

install(TARGETS script
EXPORT script-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/script
)
install(EXPORT script-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
2 changes: 0 additions & 2 deletions lib/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ set_target_properties(utils PROPERTIES

install(TARGETS utils
EXPORT utils-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/utils
)
install(EXPORT utils-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
6 changes: 0 additions & 6 deletions lib/win/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -374,36 +374,30 @@ install(

install(TARGETS win
EXPORT win-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/win
)
install(TARGETS win-x11
EXPORT win-x11-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/win
)
install(TARGETS win-wl
EXPORT win-wl-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/win
)

install(EXPORT win-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
install(EXPORT win-x11-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)
install(EXPORT win-wl-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)

Expand Down
2 changes: 0 additions & 2 deletions lib/xwl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,10 @@ set_target_properties(xwl PROPERTIES

install(TARGETS xwl
EXPORT xwl-export
${INSTALL_TARGETS_DEFAULT_ARGS}
LIBRARY NAMELINK_SKIP
FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/xwl
)
install(EXPORT xwl-export
NAMESPACE kwinft::
${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft
)

0 comments on commit 2cb0994

Please sign in to comment.