From 5613e5483ca0ebd6f8e56507f9e885fd6f458c15 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 17 Jun 2023 20:25:52 +0300 Subject: [PATCH] generic: remove redundant build varibles Signed-off-by: Ivailo Monev --- CMakeLists.txt | 27 ---------------- interfaces/ktexteditor/CMakeLists.txt | 6 ++-- kdeclarative/CMakeLists.txt | 4 +-- kdecore/CMakeLists.txt | 2 +- kdecore/tests/CMakeLists.txt | 20 ++++++------ kded/CMakeLists.txt | 9 ++++-- kded/tests/CMakeLists.txt | 2 +- kdeui/CMakeLists.txt | 36 +++++++++------------ kdeui/tests/CMakeLists.txt | 6 ++-- kdeui/tests/kconfig_compiler/CMakeLists.txt | 34 +++++++++---------- kdewidgets/CMakeLists.txt | 5 ++- kdewidgets/tests/CMakeLists.txt | 5 --- kfile/CMakeLists.txt | 12 +++---- kfile/tests/CMakeLists.txt | 6 ++-- kimgio/CMakeLists.txt | 12 +++---- kinit/CMakeLists.txt | 4 +-- kinit/tests/CMakeLists.txt | 2 +- kio/CMakeLists.txt | 6 ++-- kio/metadata/CMakeLists.txt | 18 +++++------ kio/misc/CMakeLists.txt | 4 +-- kio/tests/CMakeLists.txt | 8 ++--- kioslave/file/CMakeLists.txt | 2 +- kioslave/ftp/CMakeLists.txt | 2 +- kioslave/http/CMakeLists.txt | 4 +-- knotify/CMakeLists.txt | 4 +-- knotify/tests/CMakeLists.txt | 2 +- kparts/CMakeLists.txt | 6 ++-- kparts/tests/CMakeLists.txt | 12 +++---- kpty/CMakeLists.txt | 2 +- kpty/tests/CMakeLists.txt | 2 +- kutils/CMakeLists.txt | 24 +++++++------- kutils/karchive/CMakeLists.txt | 2 +- kutils/karchive/tests/CMakeLists.txt | 6 ++-- kutils/kdnssd/CMakeLists.txt | 2 +- kutils/kemail/CMakeLists.txt | 6 ++-- kutils/kexiv2/CMakeLists.txt | 4 +-- kutils/kexiv2/tests/CMakeLists.txt | 2 +- kutils/kmediaplayer/CMakeLists.txt | 4 +-- kutils/kmediaplayer/kded/CMakeLists.txt | 2 +- kutils/kmediaplayer/tests/CMakeLists.txt | 2 +- kutils/kpasswdstore/CMakeLists.txt | 4 +-- kutils/kpasswdstore/kded/CMakeLists.txt | 4 +-- kutils/kpasswdstore/tests/CMakeLists.txt | 4 +-- kutils/kpowermanager/CMakeLists.txt | 6 ++-- kutils/kpowermanager/kded/CMakeLists.txt | 4 +-- plasma/CMakeLists.txt | 12 +++---- plasma/tests/CMakeLists.txt | 6 ++-- solid/solid/CMakeLists.txt | 2 +- solid/tests/CMakeLists.txt | 6 ++-- 49 files changed, 165 insertions(+), 201 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a359d012..33c3f81e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,33 +69,6 @@ set(KDE4_DEFINITIONS -DQT_DEPRECATED_WARNINGS ) -set(_kde_libraries - kmediaplayer - kcmutils - kdeclarative - kdecore - kdeui - kexiv2 - kpasswdstore - kpowermanager - kdnssd - karchive - kemail - kfile - kidletime - kio - knotifyconfig - kparts - kpty - ktexteditor - plasma - solid -) -foreach(_lib ${_kde_libraries}) - string(TOUPPER ${_lib} _upperlib) - set(KDE4_${_upperlib}_LIBS ${_lib}) -endforeach() - configure_file( "${CMAKE_SOURCE_DIR}/cmake/modules/kde4_exec.sh.in" "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/kde4_exec.sh" diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/ktexteditor/CMakeLists.txt index 6fed16a4..02605c4f 100644 --- a/interfaces/ktexteditor/CMakeLists.txt +++ b/interfaces/ktexteditor/CMakeLists.txt @@ -36,10 +36,10 @@ set(ktexteditor_LIB_SRCS add_library(ktexteditor SHARED ${ktexteditor_LIB_SRCS}) target_link_libraries(ktexteditor - ${KDE4_KDECORE_LIBS} - ${KDE4_KPARTS_LIBS} - ${KDE4_KEMAIL_LIBS} ${QT_QTDBUS_LIBRARY} + kdecore + kparts + kemail ) set_target_properties(ktexteditor PROPERTIES diff --git a/kdeclarative/CMakeLists.txt b/kdeclarative/CMakeLists.txt index a1a95a7c..466c9484 100644 --- a/kdeclarative/CMakeLists.txt +++ b/kdeclarative/CMakeLists.txt @@ -38,10 +38,10 @@ set_target_properties(kdeclarative PROPERTIES ) target_link_libraries(kdeclarative PUBLIC - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} + kdecore + kdeui ) if(ENABLE_TESTING) diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index e5c64519..fe93db7a 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -197,7 +197,7 @@ configure_file( add_executable(kde4-config kde-config.cpp ) -target_link_libraries(kde4-config ${KDE4_KDECORE_LIBS}) +target_link_libraries(kde4-config kdecore) install( TARGETS kde4-config diff --git a/kdecore/tests/CMakeLists.txt b/kdecore/tests/CMakeLists.txt index a68fc570..9bc47bb7 100644 --- a/kdecore/tests/CMakeLists.txt +++ b/kdecore/tests/CMakeLists.txt @@ -4,13 +4,13 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) MACRO(KDECORE_UNIT_TESTS) FOREACH(_testname ${ARGN}) kde4_add_test(kdecore-${_testname} ${_testname}.cpp) - target_link_libraries(kdecore-${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(kdecore-${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} kdecore) ENDFOREACH(_testname) ENDMACRO(KDECORE_UNIT_TESTS) MACRO(KDECORE_EXECUTABLE_TESTS) FOREACH(_testname ${ARGN}) kde4_add_manual_test(kdecore-${_testname} ${_testname}.cpp) - target_link_libraries(kdecore-${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}) + target_link_libraries(kdecore-${_testname} ${QT_QTTEST_LIBRARY} kdecore) ENDFOREACH(_testname) ENDMACRO(KDECORE_EXECUTABLE_TESTS) @@ -71,46 +71,46 @@ KDECORE_EXECUTABLE_TESTS( # compile KEntryMap into the test since it's not exported set(kentrymaptest_SRCS kentrymaptest.cpp ../config/kconfigdata.cpp) kde4_add_test(kdecore-kentrymaptest ${kentrymaptest_SRCS}) -target_link_libraries(kdecore-kentrymaptest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ) +target_link_libraries(kdecore-kentrymaptest ${QT_QTTEST_LIBRARY} kdecore) ########### klocaletest ############### # compile into the test since it's not exported set(klocaletest_SRCS klocaletest.cpp ../date/kdayperiod.cpp) kde4_add_test(kdecore-klocaletest ${klocaletest_SRCS}) -target_link_libraries(kdecore-klocaletest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ) +target_link_libraries(kdecore-klocaletest ${QT_QTTEST_LIBRARY} kdecore) ########### kdatetimeformattertest ############### # compile KDateTimeFormatter and KDayPeriod into the test since it's not exported set(kdatetimeformattertest_SRCS kdatetimeformattertest.cpp ../date/kdatetimeformatter.cpp ../date/kdayperiod.cpp) kde4_add_test(kdecore-kdatetimeformattertest ${kdatetimeformattertest_SRCS}) -target_link_libraries(kdecore-kdatetimeformattertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ) +target_link_libraries(kdecore-kdatetimeformattertest ${QT_QTTEST_LIBRARY} kdecore) ########### kmimetypetest ############### # compile kmimemagicrule.cpp into the test since it's not exported and we call match(). set(kmimetypetest_SRCS kmimetypetest.cpp ../services/kmimemagicrule.cpp) kde4_add_test(kdecore-kmimetypetest ${kmimetypetest_SRCS}) -target_link_libraries(kdecore-kmimetypetest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(kdecore-kmimetypetest ${QT_QTTEST_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} kdecore) ########### kmimeglobsfileparsertest ############### # compile kmimeglobsfileparser.cpp into the test since it's not exported set(kmimeglobsfileparsertest_SRCS kmimeglobsfileparsertest.cpp ../services/kmimeglobsfileparser.cpp) kde4_add_test(kdecore-kmimeglobsfileparsertest ${kmimeglobsfileparsertest_SRCS}) -target_link_libraries(kdecore-kmimeglobsfileparsertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(kdecore-kmimeglobsfileparsertest ${QT_QTTEST_LIBRARY} kdecore) ########### module for klibloadertest4 ############### -set(klibloadertestmodule4_PART_SRCS klibloadertest4_module.cpp ) +set(klibloadertestmodule4_PART_SRCS klibloadertest4_module.cpp) kde4_add_plugin(kdecore-klibloadertestmodule4 ${klibloadertestmodule4_PART_SRCS}) -target_link_libraries(kdecore-klibloadertestmodule4 ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(kdecore-klibloadertestmodule4 ${QT_QTTEST_LIBRARY} kdecore) ########### kcompositejobtest ############### set(kcompositejobtest_SRCS kcompositejobtest.cpp) kde4_add_test(kdecore-kcompositejobtest ${kcompositejobtest_SRCS}) -target_link_libraries(kdecore-kcompositejobtest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(kdecore-kcompositejobtest ${QT_QTTEST_LIBRARY} kdecore) diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index e3a37ed0..47785dd2 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -26,7 +26,10 @@ set(kded_SRCS add_executable(kded4 ${kded_SRCS}) -target_link_libraries(kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) +target_link_libraries(kded4 + ${X11_LIBRARIES} + kio +) install( TARGETS kded4 @@ -56,9 +59,9 @@ set(kbuildsycoca_SRCS ) if(KBUILDSYCOCA_NO_KCRASH) - set(KBUILDSYCOCA_MAIN_LIBS ${KDE4_KDECORE_LIBS}) + set(KBUILDSYCOCA_MAIN_LIBS kdecore) else() - set(KBUILDSYCOCA_MAIN_LIBS ${KDE4_KDEUI_LIBS}) + set(KBUILDSYCOCA_MAIN_LIBS kdeui) endif() add_executable(kbuildsycoca4 ${kbuildsycoca_SRCS}) diff --git a/kded/tests/CMakeLists.txt b/kded/tests/CMakeLists.txt index 336762f9..39b46747 100644 --- a/kded/tests/CMakeLists.txt +++ b/kded/tests/CMakeLists.txt @@ -6,5 +6,5 @@ set(kmimeassociationstest_SRCS kmimeassociationstest.cpp ../kmimeassociations.cp kde4_add_test(kded-kmimeassociationstest ${kmimeassociationstest_SRCS}) -target_link_libraries(kded-kmimeassociationstest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(kded-kmimeassociationstest ${QT_QTTEST_LIBRARY} kdecore) diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt index 8029571e..8f3c2a7a 100644 --- a/kdeui/CMakeLists.txt +++ b/kdeui/CMakeLists.txt @@ -107,6 +107,11 @@ set(kdeui_LIB_SRCS dialogs/ksplashscreen.cpp dialogs/kswitchlanguagedialog_p.cpp dialogs/ktip.cpp + dialogs/kdeprintdialog.cpp + dialogs/kcupsoptionswidget_p.cpp + dialogs/kcupsoptionsjobwidget_p.cpp + dialogs/kcupsoptionspageswidget_p.cpp + dialogs/kcupsoptionssettingswidget_p.cpp findreplace/kfind.cpp findreplace/kreplace.cpp findreplace/kfinddialog.cpp @@ -160,6 +165,9 @@ set(kdeui_LIB_SRCS notifications/kdbusmenuexporter.cpp notifications/kdbusmenuimporter.cpp notifications/kdbusmenu_p.cpp + notifications/ksystemtrayicon.cpp + notifications/kstatusnotifieritem.cpp + notifications/kstatusnotifieritemdbus_p.cpp paged/kpagedialog.cpp paged/kpageview.cpp paged/kpageview_p.cpp @@ -196,6 +204,7 @@ set(kdeui_LIB_SRCS util/kpixmapsequenceoverlaypainter.cpp util/kpixmapsequencewidget.cpp util/kimageio.cpp + util/kkeyserver_x11.cpp widgets/kactionselector.cpp widgets/kdialogbuttonbox.cpp widgets/kbuttongroup.cpp @@ -256,10 +265,9 @@ set(kdeui_LIB_SRCS xmlgui/kxmlguifactory.cpp xmlgui/kxmlguifactory_p.cpp xmlgui/kxmlguiversionhandler.cpp - dialogs/kdeprintdialog.cpp - notifications/ksystemtrayicon.cpp - notifications/kstatusnotifieritem.cpp - notifications/kstatusnotifieritemdbus_p.cpp + windowmanagement/kwindowsystem_x11.cpp + windowmanagement/kwindowinfo_x11.cpp + windowmanagement/netwm.cpp ) qt4_add_dbus_interface(kdeui_LIB_SRCS @@ -273,21 +281,7 @@ qt4_add_dbus_adaptor(kdeui_LIB_SRCS KStatusNotifierItemDBus ) -if(Q_WS_X11) - set(kdeui_LIB_SRCS - ${kdeui_LIB_SRCS} - util/kkeyserver_x11.cpp - dialogs/kcupsoptionswidget_p.cpp - dialogs/kcupsoptionsjobwidget_p.cpp - dialogs/kcupsoptionspageswidget_p.cpp - dialogs/kcupsoptionssettingswidget_p.cpp - windowmanagement/kwindowsystem_x11.cpp - windowmanagement/kwindowinfo_x11.cpp - windowmanagement/netwm.cpp - ) -endif() - -if (Q_WS_X11 AND X11_Xkb_FOUND AND X11_Xkbfile_FOUND) +if (X11_Xkb_FOUND AND X11_Xkbfile_FOUND) include_directories ( ${X11_Xkb_INCLUDE_PATH} ${X11_Xlib_INCLUDE_PATH} @@ -342,15 +336,15 @@ add_library(kdeui SHARED ${kdeui_LIB_SRCS}) target_link_libraries(kdeui PRIVATE ${X11_LIBRARIES} - ${KDEUI_EXTRA_LIBS} ${ENCHANT_LIBRARIES} + ${KDEUI_EXTRA_LIBS} ) target_link_libraries(kdeui PUBLIC - ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY} + kdecore ) if(X11_XTest_FOUND) diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt index e50dda31..d78b70f8 100644 --- a/kdeui/tests/CMakeLists.txt +++ b/kdeui/tests/CMakeLists.txt @@ -11,9 +11,9 @@ MACRO(KDEUI_UNIT_TESTS) kde4_add_test(kdeui-${_testname} ${_testname}.cpp) endif() target_link_libraries(kdeui-${_testname} - ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} + kdeui ) ENDFOREACH(_testname) ENDMACRO(KDEUI_UNIT_TESTS) @@ -25,9 +25,9 @@ MACRO(KDEUI_EXECUTABLE_TESTS) kde4_add_manual_test(kdeui-${_testname} ${_testname}.cpp) endif() target_link_libraries(kdeui-${_testname} - ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} + kdeui ) ENDFOREACH(_testname) ENDMACRO(KDEUI_EXECUTABLE_TESTS) @@ -154,4 +154,4 @@ set(kcolorUtilsDemoSources ../colors/kcolorspaces.cpp ) kde4_add_manual_test(kcolorutilsdemo ${kcolorUtilsDemoSources}) -target_link_libraries(kcolorutilsdemo ${KDE4_KDEUI_LIBS}) +target_link_libraries(kcolorutilsdemo kdeui) diff --git a/kdeui/tests/kconfig_compiler/CMakeLists.txt b/kdeui/tests/kconfig_compiler/CMakeLists.txt index e491d8a7..dd0f169e 100644 --- a/kdeui/tests/kconfig_compiler/CMakeLists.txt +++ b/kdeui/tests/kconfig_compiler/CMakeLists.txt @@ -9,7 +9,7 @@ macro(ADD_KCONFIG_TEST _testName) kde4_add_manual_test(${_testName} ${_testSrc}) - target_link_libraries(${_testName} ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}) + target_link_libraries(${_testName} ${QT_QTTEST_LIBRARY} kdecore kdeui) endmacro() ########### next target ############### @@ -18,31 +18,31 @@ ADD_KCONFIG_TEST(test1 test1main.cpp) ########### next target ############### -ADD_KCONFIG_TEST(test2 test2main.cpp ) +ADD_KCONFIG_TEST(test2 test2main.cpp) ########### next target ############### -ADD_KCONFIG_TEST(test3 test3main.cpp ) +ADD_KCONFIG_TEST(test3 test3main.cpp) ########### next target ############### -ADD_KCONFIG_TEST(test3a test3amain.cpp ) +ADD_KCONFIG_TEST(test3a test3amain.cpp) ########### next target ############### -ADD_KCONFIG_TEST(test4 test4main.cpp ) +ADD_KCONFIG_TEST(test4 test4main.cpp) ########### next target ############### -ADD_KCONFIG_TEST(test5 test5main.cpp ) +ADD_KCONFIG_TEST(test5 test5main.cpp) ########### next target ############### -ADD_KCONFIG_TEST(test6 test6main.cpp ) +ADD_KCONFIG_TEST(test6 test6main.cpp) ########### next target ############### -ADD_KCONFIG_TEST(test7 test7main.cpp ) +ADD_KCONFIG_TEST(test7 test7main.cpp) ########### next target ############### @@ -53,42 +53,42 @@ kde4_add_kcfg_files(test8b test8_SRCS) kde4_add_manual_test(test8 ${test8_SRCS}) -target_link_libraries(test8 ${KDE4_KDEUI_LIBS} ) +target_link_libraries(test8 kdeui) ########### next target ############### -ADD_KCONFIG_TEST(test9 test9main.cpp ) +ADD_KCONFIG_TEST(test9 test9main.cpp) ########### next target ############### -ADD_KCONFIG_TEST(test10 test10main.cpp ) +ADD_KCONFIG_TEST(test10 test10main.cpp) ########### next target ############### -set(test11_SRCS test11main.cpp ) +set(test11_SRCS test11main.cpp) kde4_add_kcfg_files(test11 test11_SRCS) kde4_add_kcfg_files(test11a test11_SRCS) kde4_add_manual_test(test11 ${test11_SRCS}) -target_link_libraries(test11 ${KDE4_KDEUI_LIBS} ) +target_link_libraries(test11 kdeui) ########### next target ############### -ADD_KCONFIG_TEST(test12 test12main.cpp ) +ADD_KCONFIG_TEST(test12 test12main.cpp) ########### next target ############### -ADD_KCONFIG_TEST(test_dpointer test_dpointer_main.cpp ) +ADD_KCONFIG_TEST(test_dpointer test_dpointer_main.cpp) ########### next target ############### -ADD_KCONFIG_TEST(test_signal test_signal_main.cpp ) +ADD_KCONFIG_TEST(test_signal test_signal_main.cpp) ########### next target ############### -ADD_KCONFIG_TEST(kconfigcompiler_test kconfigcompiler_test.cpp ) +ADD_KCONFIG_TEST(kconfigcompiler_test kconfigcompiler_test.cpp) diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt index cbf39abf..daf6ae66 100644 --- a/kdewidgets/CMakeLists.txt +++ b/kdewidgets/CMakeLists.txt @@ -16,8 +16,7 @@ include_directories( ########### next target ############### add_executable(makekdewidgets makekdewidgets.cpp) - -target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS}) +target_link_libraries(makekdewidgets kdecore) install( TARGETS makekdewidgets @@ -32,7 +31,7 @@ if(QT_QTUITOOLS_FOUND) kde4_add_plugin(kdewidgets ${kdewidgets_SRCS}) - target_link_libraries(kdewidgets ${KDE4_KIO_LIBS} ${KDE4_KMEDIAPLAYER_LIBS}) + target_link_libraries(kdewidgets kio kmediaplayer) install( TARGETS kdewidgets diff --git a/kdewidgets/tests/CMakeLists.txt b/kdewidgets/tests/CMakeLists.txt index 59bb3fde..c31368e4 100644 --- a/kdewidgets/tests/CMakeLists.txt +++ b/kdewidgets/tests/CMakeLists.txt @@ -1,7 +1,2 @@ - - # TODO test programs - - - diff --git a/kfile/CMakeLists.txt b/kfile/CMakeLists.txt index 82251c91..37cdd5db 100644 --- a/kfile/CMakeLists.txt +++ b/kfile/CMakeLists.txt @@ -44,10 +44,10 @@ set(kfile_LIB_SRCS add_library(kfile SHARED ${kfile_LIB_SRCS}) target_link_libraries(kfile PUBLIC - ${KDE4_SOLID_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KDECORE_LIBS} + kdecore + kdeui + kio + solid ) set_target_properties(kfile PROPERTIES @@ -86,8 +86,8 @@ install( kde4_add_plugin(kfilemodule kfilemodule.cpp) target_link_libraries(kfilemodule - ${KDE4_KFILE_LIBS} - ${KDE4_KIO_LIBS} + kfile + kio ) install( diff --git a/kfile/tests/CMakeLists.txt b/kfile/tests/CMakeLists.txt index a667b7f1..a409aa49 100644 --- a/kfile/tests/CMakeLists.txt +++ b/kfile/tests/CMakeLists.txt @@ -2,10 +2,10 @@ MACRO(KFILE_UNIT_TESTS) FOREACH(_testname ${ARGN}) kde4_add_test(kfile-${_testname} ${_testname}.cpp) target_link_libraries(kfile-${_testname} - ${KDE4_KFILE_LIBS} - ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} + kfile + kio ) ENDFOREACH(_testname) ENDMACRO(KFILE_UNIT_TESTS) @@ -13,8 +13,8 @@ MACRO(KFILE_EXECUTABLE_TESTS) FOREACH(_testname ${ARGN}) KDE4_ADD_MANUAL_TEST(kfile-${_testname} ${_testname}.cpp) target_link_libraries(kfile-${_testname} - ${KDE4_KFILE_LIBS} ${QT_QTTEST_LIBRARY} + kfile ) ENDFOREACH(_testname) ENDMACRO(KFILE_EXECUTABLE_TESTS) diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt index 1d76725c..39cd42d5 100644 --- a/kimgio/CMakeLists.txt +++ b/kimgio/CMakeLists.txt @@ -6,8 +6,8 @@ include_directories(${KDE4_KDEUI_INCLUDES}) kde4_add_plugin(kimg_ico ico.cpp) target_link_libraries(kimg_ico - ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} + kdecore ) set_target_properties(kimg_ico PROPERTIES OUTPUT_NAME ico @@ -24,9 +24,9 @@ if(WEBP_FOUND) include_directories(${WEBP_INCLUDES}) kde4_add_plugin(kimg_webp webp.cpp) target_link_libraries(kimg_webp - ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${WEBP_LIBRARIES} + kdecore ) set_target_properties(kimg_webp PROPERTIES OUTPUT_NAME webp @@ -44,9 +44,9 @@ if(LIBRAW_FOUND) include_directories(${LIBRAW_INCLUDE_DIR}) kde4_add_plugin(kimg_raw raw.cpp) target_link_libraries(kimg_raw - ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${LIBRAW_LIBRARIES} + kdecore ) set_target_properties(kimg_raw PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" @@ -65,9 +65,9 @@ if(LIBJPEG_FOUND) include_directories(${LIBJPEG_INCLUDE_DIR}) kde4_add_plugin(kimg_jpg jpg.cpp) target_link_libraries(kimg_jpg - ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${LIBJPEG_LIBRARIES} + kdecore ) set_target_properties(kimg_jpg PROPERTIES OUTPUT_NAME jpg @@ -85,9 +85,9 @@ if(OPENJPEG_FOUND) include_directories(${OPENJPEG_INCLUDE_DIR}) kde4_add_plugin(kimg_jp2 jp2.cpp) target_link_libraries(kimg_jp2 - ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${OPENJPEG_LIBRARIES} + kdecore ) set_target_properties(kimg_jp2 PROPERTIES OUTPUT_NAME jp2 @@ -105,9 +105,9 @@ if(TIFF_FOUND) include_directories(${TIFF_INCLUDE_DIRS}) kde4_add_plugin(kimg_tiff tiff.cpp) target_link_libraries(kimg_tiff - ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${TIFF_LIBRARIES} + kdecore ) set_target_properties(kimg_tiff PROPERTIES OUTPUT_NAME tiff diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt index 892c3281..f5b41074 100644 --- a/kinit/CMakeLists.txt +++ b/kinit/CMakeLists.txt @@ -32,8 +32,8 @@ qt4_generate_dbus_interface(klauncher_adaptor.h org.kde.KLauncher.xml) add_executable(klauncher4 ${klauncher_SRCS}) target_link_libraries(klauncher4 - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} + kdeui + kio ) kde4_add_dbus_service(org.kde.klauncher.service.in) diff --git a/kinit/tests/CMakeLists.txt b/kinit/tests/CMakeLists.txt index 1413ac95..22dfe84d 100644 --- a/kinit/tests/CMakeLists.txt +++ b/kinit/tests/CMakeLists.txt @@ -2,4 +2,4 @@ include_directories(${KDE4_KIO_INCLUDES}) kde4_add_manual_test(klaunchertest klaunchertest.cpp) -target_link_libraries(klaunchertest ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(klaunchertest kdecore kio) diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index c9646905..8235812f 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -132,12 +132,12 @@ set(kio_LIB_SRCS add_library(kio SHARED ${kio_LIB_SRCS}) target_link_libraries(kio PUBLIC - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KPASSWDSTORE_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} + kdecore + kdeui + kpasswdstore ) if(ACL_FOUND) diff --git a/kio/metadata/CMakeLists.txt b/kio/metadata/CMakeLists.txt index 5e9af421..5e71e3d4 100644 --- a/kio/metadata/CMakeLists.txt +++ b/kio/metadata/CMakeLists.txt @@ -2,8 +2,8 @@ set(kfilemetadata_exiv2_SRCS kfilemetadata_exiv2.cpp) kde4_add_plugin(kfilemetadata_exiv2 ${kfilemetadata_exiv2_SRCS}) target_link_libraries(kfilemetadata_exiv2 - ${KDE4_KIO_LIBS} - ${KDE4_KEXIV2_LIBS} + kio + kexiv2 ) install( @@ -23,8 +23,8 @@ if (FFMPEG_FOUND) kde4_add_plugin(kfilemetadata_ffmpeg ${kfilemetadata_ffmpeg_SRCS}) target_link_libraries(kfilemetadata_ffmpeg - ${KDE4_KIO_LIBS} ${FFMPEG_LIBRARIES} + kio ) install( @@ -45,8 +45,8 @@ if (TAGLIB_FOUND) kde4_add_plugin(kfilemetadata_taglib ${kfilemetadata_taglib_SRCS}) target_link_libraries(kfilemetadata_taglib - ${KDE4_KIO_LIBS} ${TAGLIB_LIBRARIES} + kio ) install( @@ -67,8 +67,8 @@ if (EPUB_FOUND) kde4_add_plugin(kfilemetadata_epub ${kfilemetadata_epub_SRCS}) target_link_libraries(kfilemetadata_epub - ${KDE4_KIO_LIBS} ${EPUB_LIBRARIES} + kio ) install( @@ -89,8 +89,8 @@ if (POPPLER_FOUND) kde4_add_plugin(kfilemetadata_poppler ${kfilemetadata_poppler_SRCS}) target_link_libraries(kfilemetadata_poppler - ${KDE4_KIO_LIBS} ${POPPLER_LIBRARIES} + kio ) install( @@ -111,8 +111,8 @@ if (LIBSPECTRE_FOUND) kde4_add_plugin(kfilemetadata_spectre ${kfilemetadata_spectre_SRCS}) target_link_libraries(kfilemetadata_spectre - ${KDE4_KIO_LIBS} ${LIBSPECTRE_LIBRARY} + kio ) install( @@ -133,8 +133,8 @@ if (FREETYPE_FOUND) kde4_add_plugin(kfilemetadata_freetype ${kfilemetadata_freetype_SRCS}) target_link_libraries(kfilemetadata_freetype - ${KDE4_KIO_LIBS} ${FREETYPE_LIBRARIES} + kio ) install( @@ -155,8 +155,8 @@ if (DJVULIBRE_FOUND) kde4_add_plugin(kfilemetadata_djvulibre ${kfilemetadata_djvulibre_SRCS}) target_link_libraries(kfilemetadata_djvulibre - ${KDE4_KIO_LIBS} ${DJVULIBRE_LIBRARY} + kio ) install( diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt index 44b6dea4..262faa6f 100644 --- a/kio/misc/CMakeLists.txt +++ b/kio/misc/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories(BEFORE ${CMAKE_SOURCE_DIR}/kio) add_executable(kmailservice kmailservice.cpp) -target_link_libraries(kmailservice ${KDE4_KDECORE_LIBS}) +target_link_libraries(kmailservice kdecore) install( TARGETS kmailservice @@ -21,7 +21,7 @@ install( add_executable(ktelnetservice ktelnetservice.cpp) -target_link_libraries(ktelnetservice ${KDE4_KDEUI_LIBS}) +target_link_libraries(ktelnetservice kdeui) install( TARGETS ktelnetservice diff --git a/kio/tests/CMakeLists.txt b/kio/tests/CMakeLists.txt index a2725cfe..0bf2727b 100644 --- a/kio/tests/CMakeLists.txt +++ b/kio/tests/CMakeLists.txt @@ -5,13 +5,13 @@ include_directories(${KDE4_KIO_INCLUDES}) MACRO(KIO_UNIT_TESTS) FOREACH(_testname ${ARGN}) kde4_add_test(kio-${_testname} ${_testname}.cpp) - target_link_libraries(kio-${_testname} ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY}) + target_link_libraries(kio-${_testname} ${QT_QTTEST_LIBRARY} kio) ENDFOREACH(_testname) ENDMACRO(KIO_UNIT_TESTS) MACRO(KIO_EXECUTABLE_TESTS) FOREACH(_testname ${ARGN}) kde4_add_manual_test(kio-${_testname} ${_testname}.cpp) - target_link_libraries(kio-${_testname} ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY}) + target_link_libraries(kio-${_testname} ${QT_QTTEST_LIBRARY} kio) ENDFOREACH(_testname) ENDMACRO(KIO_EXECUTABLE_TESTS) @@ -59,9 +59,9 @@ KIO_EXECUTABLE_TESTS( set(kfstest_SRCS kfstest.cpp kfdtest.cpp) kde4_add_manual_test(kfstest ${kfstest_SRCS}) -target_link_libraries(kfstest ${KDE4_KIO_LIBS}) +target_link_libraries(kfstest kio) ########### kfilemetainfotest ############### kde4_add_test(kio-kfilemetainfotest kfilemetainfotest.cpp) -target_link_libraries(kio-kfilemetainfotest ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(kio-kfilemetainfotest ${QT_QTTEST_LIBRARY} kio) diff --git a/kioslave/file/CMakeLists.txt b/kioslave/file/CMakeLists.txt index 789566b6..42dff11b 100644 --- a/kioslave/file/CMakeLists.txt +++ b/kioslave/file/CMakeLists.txt @@ -14,7 +14,7 @@ set(kio_file_PART_SRCS file.cpp file_unix.cpp) add_executable(kio_file ${kio_file_PART_SRCS}) -target_link_libraries(kio_file ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(kio_file kdecore kio) if(ACL_FOUND) target_link_libraries(kio_file ${ACL_LIBS}) diff --git a/kioslave/ftp/CMakeLists.txt b/kioslave/ftp/CMakeLists.txt index 54966f0a..c6d41ac2 100644 --- a/kioslave/ftp/CMakeLists.txt +++ b/kioslave/ftp/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories(${KDE4_KIO_INCLUDES}) add_executable(kio_ftp ftp.cpp) -target_link_libraries(kio_ftp ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(kio_ftp kdecore kio) install(TARGETS kio_ftp DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt index b44f1988..6af6cf05 100644 --- a/kioslave/http/CMakeLists.txt +++ b/kioslave/http/CMakeLists.txt @@ -10,9 +10,9 @@ include_directories( add_executable(kio_http http.cpp) target_link_libraries(kio_http - ${KDE4_KDECORE_LIBS} - ${KDE4_KIO_LIBS} ${CURL_LIBRARIES} + kdecore + kio ) install(TARGETS kio_http DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) diff --git a/knotify/CMakeLists.txt b/knotify/CMakeLists.txt index 2847b50c..2c552dfc 100644 --- a/knotify/CMakeLists.txt +++ b/knotify/CMakeLists.txt @@ -23,10 +23,10 @@ add_library(knotifyconfig SHARED ${knotifyconfig_LIB_SRCS}) # Needs KIO for KUrlRequester target_link_libraries(knotifyconfig PUBLIC - ${KDE4_KIO_LIBS} - ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} + kdecore + kio ) set_target_properties(knotifyconfig PROPERTIES diff --git a/knotify/tests/CMakeLists.txt b/knotify/tests/CMakeLists.txt index 28d4c946..8a82bbc6 100644 --- a/knotify/tests/CMakeLists.txt +++ b/knotify/tests/CMakeLists.txt @@ -9,4 +9,4 @@ set(knotifytest_SRCS main.cpp knotifytestwindow.cpp) kde4_add_manual_test(knotifytest ${knotifytest_SRCS}) -target_link_libraries(knotifytest ${KDE4_KIO_LIBS} knotifyconfig) +target_link_libraries(knotifytest knotifyconfig kio) diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt index 75f7da9d..bf31d5cb 100644 --- a/kparts/CMakeLists.txt +++ b/kparts/CMakeLists.txt @@ -25,9 +25,9 @@ set(kparts_LIB_SRCS add_library(kparts SHARED ${kparts_LIB_SRCS}) target_link_libraries(kparts PUBLIC - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} + kdecore + kdeui + kio ) set_target_properties(kparts PROPERTIES diff --git a/kparts/tests/CMakeLists.txt b/kparts/tests/CMakeLists.txt index e140089d..0d318ce0 100644 --- a/kparts/tests/CMakeLists.txt +++ b/kparts/tests/CMakeLists.txt @@ -10,7 +10,7 @@ set(kpartstest_SRCS kde4_add_manual_test(kparts-kpartstest ${kpartstest_SRCS}) -target_link_libraries(kparts-kpartstest ${KDE4_KPARTS_LIBS}) +target_link_libraries(kparts-kpartstest kparts) ########### next target ############### @@ -22,19 +22,19 @@ set(normalktmtest_SRCS kde4_add_manual_test(kparts-normalktmtest ${normalktmtest_SRCS}) -target_link_libraries(kparts-normalktmtest ${KDE4_KPARTS_LIBS}) +target_link_libraries(kparts-normalktmtest kparts) ########### next target ############### kde4_add_manual_test(kparts-partviewer partviewer.cpp) -target_link_libraries(kparts-partviewer ${KDE4_KPARTS_LIBS}) +target_link_libraries(kparts-partviewer kparts) ########### next target ############### kde4_add_plugin(notepadpart notepad.cpp) -target_link_libraries(notepadpart ${KDE4_KPARTS_LIBS}) +target_link_libraries(notepadpart kparts) target_compile_definitions(notepadpart PRIVATE -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/") @@ -45,13 +45,13 @@ install(TARGETS notepadpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) MACRO(KPARTS_UNIT_TESTS) FOREACH(_testname ${ARGN}) kde4_add_test(kparts-${_testname} ${_testname}.cpp) - target_link_libraries(kparts-${_testname} ${KDE4_KPARTS_LIBS} ${QT_QTTEST_LIBRARY}) + target_link_libraries(kparts-${_testname} ${QT_QTTEST_LIBRARY} kparts) ENDFOREACH(_testname) ENDMACRO(KPARTS_UNIT_TESTS) MACRO(KPARTS_EXECUTABLE_TESTS) FOREACH(_testname ${ARGN}) kde4_add_manual_test(kparts-${_testname} ${_testname}.cpp) - target_link_libraries(kparts-${_testname} ${KDE4_KPARTS_LIBS} ${QT_QTTEST_LIBRARY}) + target_link_libraries(kparts-${_testname} ${QT_QTTEST_LIBRARY} kparts) ENDFOREACH(_testname) ENDMACRO(KPARTS_EXECUTABLE_TESTS) diff --git a/kpty/CMakeLists.txt b/kpty/CMakeLists.txt index 467a7ec6..1d40ecf4 100644 --- a/kpty/CMakeLists.txt +++ b/kpty/CMakeLists.txt @@ -15,7 +15,7 @@ target_link_libraries(kpty PRIVATE ) target_link_libraries(kpty PUBLIC - ${KDE4_KDECORE_LIBS} + kdecore ) set_target_properties(kpty PROPERTIES diff --git a/kpty/tests/CMakeLists.txt b/kpty/tests/CMakeLists.txt index 7c26102b..403d9585 100644 --- a/kpty/tests/CMakeLists.txt +++ b/kpty/tests/CMakeLists.txt @@ -2,4 +2,4 @@ include_directories(${KDE4_KPTY_INCLUDES}) kde4_add_test(kptyprocesstest kptyprocesstest.cpp) -target_link_libraries(kptyprocesstest ${KDE4_KPTY_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(kptyprocesstest ${QT_QTTEST_LIBRARY} kpty) diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt index 09bcdae7..bab293c6 100644 --- a/kutils/CMakeLists.txt +++ b/kutils/CMakeLists.txt @@ -49,21 +49,19 @@ set_source_files_properties( add_library(kidletime SHARED ${kidletime_LIB_SRCS}) target_link_libraries(kidletime PUBLIC - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} + kdecore + kdeui ) -if (Q_WS_X11) - if(HAVE_XSCREENSAVER) - target_link_libraries(kidletime PRIVATE ${X11_Xscreensaver_LIB}) - endif() +if(HAVE_XSCREENSAVER) + target_link_libraries(kidletime PRIVATE ${X11_Xscreensaver_LIB}) +endif() - if(HAVE_XSYNC) - target_link_libraries(kidletime PRIVATE ${X11_Xext_LIB}) - endif() - target_link_libraries(kidletime PRIVATE ${X11_X11_LIB}) -endif (Q_WS_X11) +if(HAVE_XSYNC) + target_link_libraries(kidletime PRIVATE ${X11_Xext_LIB}) +endif() +target_link_libraries(kidletime PRIVATE ${X11_X11_LIB}) set_target_properties(kidletime PROPERTIES VERSION ${GENERIC_LIB_VERSION} @@ -104,9 +102,9 @@ set(kcmutils_LIB_SRCS add_library(kcmutils SHARED ${kcmutils_LIB_SRCS}) target_link_libraries(kcmutils PUBLIC - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} + kdecore + kdeui ) set_target_properties(kcmutils PROPERTIES diff --git a/kutils/karchive/CMakeLists.txt b/kutils/karchive/CMakeLists.txt index d2cfc484..7bd0dcd3 100644 --- a/kutils/karchive/CMakeLists.txt +++ b/kutils/karchive/CMakeLists.txt @@ -22,7 +22,7 @@ set(karchive_LIB_SRCS add_library(karchive SHARED ${karchive_LIB_SRCS}) target_link_libraries(karchive PUBLIC - ${KDE4_KDECORE_LIBS} + kdecore ) target_link_libraries(karchive PRIVATE ${LIBDEFLATE_LIBRARIES} diff --git a/kutils/karchive/tests/CMakeLists.txt b/kutils/karchive/tests/CMakeLists.txt index d42fb3fe..83c0474e 100644 --- a/kutils/karchive/tests/CMakeLists.txt +++ b/kutils/karchive/tests/CMakeLists.txt @@ -6,14 +6,14 @@ include_directories( kde4_add_test(karchive-karchivetest karchivetest.cpp ) -target_link_libraries(karchive-karchivetest ${KDE4_KARCHIVE_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(karchive-karchivetest ${QT_QTTEST_LIBRARY} karchive) kde4_add_test(karchive-kcompressortest kcompressortest.cpp ) -target_link_libraries(karchive-kcompressortest ${KDE4_KARCHIVE_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(karchive-kcompressortest ${QT_QTTEST_LIBRARY} karchive) kde4_add_test(karchive-kdecompressortest kdecompressortest.cpp ) -target_link_libraries(karchive-kdecompressortest ${KDE4_KARCHIVE_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(karchive-kdecompressortest ${QT_QTTEST_LIBRARY} karchive) diff --git a/kutils/kdnssd/CMakeLists.txt b/kutils/kdnssd/CMakeLists.txt index a57d07f1..d7118d70 100644 --- a/kutils/kdnssd/CMakeLists.txt +++ b/kutils/kdnssd/CMakeLists.txt @@ -11,8 +11,8 @@ set(kdnssd_LIB_SRCS add_library(kdnssd SHARED ${kdnssd_LIB_SRCS}) target_link_libraries(kdnssd PUBLIC - ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} + kdecore ) if(AVAHI_FOUND) diff --git a/kutils/kemail/CMakeLists.txt b/kutils/kemail/CMakeLists.txt index f3e23aa8..5205ab9f 100644 --- a/kutils/kemail/CMakeLists.txt +++ b/kutils/kemail/CMakeLists.txt @@ -15,9 +15,9 @@ set(kemail_LIB_SRCS add_library(kemail SHARED ${kemail_LIB_SRCS}) target_link_libraries(kemail PUBLIC - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KPASSWDSTORE_LIBS} + kdecore + kdeui + kpasswdstore ) target_link_libraries(kemail PRIVATE ${CURL_LIBRARIES}) diff --git a/kutils/kexiv2/CMakeLists.txt b/kutils/kexiv2/CMakeLists.txt index 0085ee1d..eef38bf9 100644 --- a/kutils/kexiv2/CMakeLists.txt +++ b/kutils/kexiv2/CMakeLists.txt @@ -12,8 +12,8 @@ set(kexiv2_LIB_SRCS add_library(kexiv2 SHARED ${kexiv2_LIB_SRCS}) target_link_libraries(kexiv2 PUBLIC - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} + kdecore + kdeui ) if(EXIV2_FOUND) diff --git a/kutils/kexiv2/tests/CMakeLists.txt b/kutils/kexiv2/tests/CMakeLists.txt index 251f8263..a7e01920 100644 --- a/kutils/kexiv2/tests/CMakeLists.txt +++ b/kutils/kexiv2/tests/CMakeLists.txt @@ -6,4 +6,4 @@ include_directories( kde4_add_test(kexiv2-kexiv2test kexiv2test.cpp ) -target_link_libraries(kexiv2-kexiv2test ${KDE4_KEXIV2_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(kexiv2-kexiv2test ${QT_QTTEST_LIBRARY} kexiv2) diff --git a/kutils/kmediaplayer/CMakeLists.txt b/kutils/kmediaplayer/CMakeLists.txt index 4c08f9ad..65ba57cb 100644 --- a/kutils/kmediaplayer/CMakeLists.txt +++ b/kutils/kmediaplayer/CMakeLists.txt @@ -18,8 +18,8 @@ set(kmediaplayer_LIB_SRCS add_library(kmediaplayer SHARED ${kmediaplayer_LIB_SRCS}) target_link_libraries(kmediaplayer PUBLIC - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} + kdecore + kdeui ) if(MPV_FOUND) diff --git a/kutils/kmediaplayer/kded/CMakeLists.txt b/kutils/kmediaplayer/kded/CMakeLists.txt index f6ac450c..db7cfed8 100644 --- a/kutils/kmediaplayer/kded/CMakeLists.txt +++ b/kutils/kmediaplayer/kded/CMakeLists.txt @@ -8,7 +8,7 @@ set(kded_kaudioplayer_SRCS qt4_generate_dbus_interface(kaudioplayer.h org.kde.kaudioplayer.xml ) kde4_add_plugin(kded_kaudioplayer ${kded_kaudioplayer_SRCS}) -target_link_libraries(kded_kaudioplayer ${KDE4_KMEDIAPLAYER_LIBS}) +target_link_libraries(kded_kaudioplayer kmediaplayer) install( TARGETS kded_kaudioplayer diff --git a/kutils/kmediaplayer/tests/CMakeLists.txt b/kutils/kmediaplayer/tests/CMakeLists.txt index 1e9f8884..5a50cbde 100644 --- a/kutils/kmediaplayer/tests/CMakeLists.txt +++ b/kutils/kmediaplayer/tests/CMakeLists.txt @@ -6,5 +6,5 @@ foreach(mantest media) kde4_add_manual_test(kmediaplayer-${mantest} k${mantest}widgettest.cpp ) - target_link_libraries(kmediaplayer-${mantest} ${KDE4_KMEDIAPLAYER_LIBS}) + target_link_libraries(kmediaplayer-${mantest} kmediaplayer) endforeach() diff --git a/kutils/kpasswdstore/CMakeLists.txt b/kutils/kpasswdstore/CMakeLists.txt index e4d3470a..9288625c 100644 --- a/kutils/kpasswdstore/CMakeLists.txt +++ b/kutils/kpasswdstore/CMakeLists.txt @@ -19,9 +19,9 @@ set(kpasswdstore_LIB_SRCS add_library(kpasswdstore SHARED ${kpasswdstore_LIB_SRCS}) target_link_libraries(kpasswdstore PUBLIC - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} + kdecore + kdeui ) set_target_properties(kpasswdstore PROPERTIES diff --git a/kutils/kpasswdstore/kded/CMakeLists.txt b/kutils/kpasswdstore/kded/CMakeLists.txt index dae658ea..8bd9aacd 100644 --- a/kutils/kpasswdstore/kded/CMakeLists.txt +++ b/kutils/kpasswdstore/kded/CMakeLists.txt @@ -10,8 +10,8 @@ qt4_generate_dbus_interface(kded_kpasswdstore.h org.kde.kpasswdstore.xml ) kde4_add_plugin(kded_kpasswdstore ${kded_kpasswdstore_SRCS}) target_link_libraries(kded_kpasswdstore PRIVATE - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} + kdecore + kdeui ) if(OPENSSL_FOUND) diff --git a/kutils/kpasswdstore/tests/CMakeLists.txt b/kutils/kpasswdstore/tests/CMakeLists.txt index 52a12d96..177a7bbf 100644 --- a/kutils/kpasswdstore/tests/CMakeLists.txt +++ b/kutils/kpasswdstore/tests/CMakeLists.txt @@ -3,9 +3,9 @@ include_directories( ) kde4_add_manual_test(kpasswdstore-manual kpasswdstoretest.cpp) -target_link_libraries(kpasswdstore-manual ${KDE4_KDECORE_LIBS} ${KDE4_KPASSWDSTORE_LIBS} ${QT_QTTEST_LIBRARY}) +target_link_libraries(kpasswdstore-manual ${QT_QTTEST_LIBRARY} kdecore kpasswdstore) kde4_add_manual_test(kpasswdroulettedialog-manual kpasswdroulettedialog-manual.cpp ) -target_link_libraries(kpasswdroulettedialog-manual ${KDE4_KPASSWDSTORE_LIBS}) +target_link_libraries(kpasswdroulettedialog-manual kpasswdstore) diff --git a/kutils/kpowermanager/CMakeLists.txt b/kutils/kpowermanager/CMakeLists.txt index a4e5a4f2..94ab1048 100644 --- a/kutils/kpowermanager/CMakeLists.txt +++ b/kutils/kpowermanager/CMakeLists.txt @@ -13,8 +13,8 @@ set(kpowermanager_LIB_SRCS add_library(kpowermanager SHARED ${kpowermanager_LIB_SRCS}) target_link_libraries(kpowermanager PUBLIC - ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} + kdecore ) set_target_properties(kpowermanager PROPERTIES @@ -54,7 +54,9 @@ set(kpowermanager_helper_srcs ) add_executable(kpowermanager_helper ${kpowermanager_helper_srcs}) -target_link_libraries(kpowermanager_helper PUBLIC ${KDE4_KDECORE_LIBS}) +target_link_libraries(kpowermanager_helper PUBLIC + kdecore +) install( TARGETS kpowermanager_helper diff --git a/kutils/kpowermanager/kded/CMakeLists.txt b/kutils/kpowermanager/kded/CMakeLists.txt index 9b7524de..3ccaa83c 100644 --- a/kutils/kpowermanager/kded/CMakeLists.txt +++ b/kutils/kpowermanager/kded/CMakeLists.txt @@ -23,9 +23,9 @@ qt4_generate_dbus_interface(kded_kpowermanager.h org.kde.kpowermanager.xml) kde4_add_plugin(kded_kpowermanager ${kded_kpowermanager_SRCS}) target_link_libraries(kded_kpowermanager PRIVATE - ${KDE4_KDECORE_LIBS} - ${KDE4_KPOWERMANAGER_LIBS} ${QT_QTDBUS_LIBRARY} + kdecore + kpowermanager ) install( diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt index 6b904baf..15809bdc 100644 --- a/plasma/CMakeLists.txt +++ b/plasma/CMakeLists.txt @@ -18,18 +18,18 @@ include_directories( if(NOT PLASMA_NO_KIO) include_directories(${KDE4_KIO_INCLUDES}) - set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KIO_LIBS}) + set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} kio) endif() if(NOT PLASMA_NO_SOLID) include_directories(${CMAKE_BINARY_DIR}/solid/) include_directories(${CMAKE_SOURCE_DIR}/solid/) - set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS}) + set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} solid) endif() if(NOT PLASMA_NO_KUTILS) include_directories(${CMAKE_SOURCE_DIR}/kutils) - set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KCMUTILS_LIBS}) + set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} kcmutils) endif() configure_file( @@ -159,10 +159,10 @@ target_link_libraries(plasma PUBLIC ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KDECLARATIVE_LIBS} ${PLASMA_EXTRA_LIBS} + kdecore + kdeui + kdeclarative ) target_link_libraries(plasma PRIVATE ${X11_LIBRARIES}) diff --git a/plasma/tests/CMakeLists.txt b/plasma/tests/CMakeLists.txt index c1e06e33..edec5a76 100644 --- a/plasma/tests/CMakeLists.txt +++ b/plasma/tests/CMakeLists.txt @@ -2,11 +2,11 @@ MACRO(PLASMA_UNIT_TESTS) FOREACH(_testname ${ARGN}) kde4_add_test(plasma-${_testname} ${_testname}.cpp) target_link_libraries(plasma-${_testname} - ${KDE4_KIO_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} + kio + kdeui + plasma ) ENDFOREACH(_testname) ENDMACRO(PLASMA_UNIT_TESTS) diff --git a/solid/solid/CMakeLists.txt b/solid/solid/CMakeLists.txt index ab285cb2..4535c72d 100644 --- a/solid/solid/CMakeLists.txt +++ b/solid/solid/CMakeLists.txt @@ -166,7 +166,7 @@ if(UDEV_FOUND) Support for m-p-i is included even if not found during build" ) - set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} ${UDEV_LIBRARIES}) + set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${QT_QTDBUS_LIBRARY} ${UDEV_LIBRARIES} kdecore) endif(UDEV_FOUND) if(DEVINFO_FOUND) diff --git a/solid/tests/CMakeLists.txt b/solid/tests/CMakeLists.txt index eecd984e..5abd5322 100644 --- a/solid/tests/CMakeLists.txt +++ b/solid/tests/CMakeLists.txt @@ -13,11 +13,11 @@ include_directories( kde4_add_test(solid-fakehardwaretest fakehardwaretest.cpp) target_link_libraries(solid-fakehardwaretest - ${KDE4_SOLID_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} + solid ) add_definitions(-DTEST_DATA="${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw/fakecomputer.xml") @@ -33,7 +33,7 @@ target_link_libraries(solid-solidhwtest ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} - ${KDE4_SOLID_LIBS} + solid ) ########### solidnettestdbusservice ############### @@ -63,4 +63,4 @@ qt4_add_dbus_interface(networkingclient_SRCS kde4_add_manual_test(solid-networkingclient ${networkingclient_SRCS}) -target_link_libraries(solid-networkingclient ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS}) +target_link_libraries(solid-networkingclient kdeui solid)