generic: remove redundant build varibles

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-17 20:25:52 +03:00
parent 870f3b4bee
commit 5613e5483c
49 changed files with 165 additions and 201 deletions

View file

@ -69,33 +69,6 @@ set(KDE4_DEFINITIONS
-DQT_DEPRECATED_WARNINGS -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( configure_file(
"${CMAKE_SOURCE_DIR}/cmake/modules/kde4_exec.sh.in" "${CMAKE_SOURCE_DIR}/cmake/modules/kde4_exec.sh.in"
"${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/kde4_exec.sh" "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/kde4_exec.sh"

View file

@ -36,10 +36,10 @@ set(ktexteditor_LIB_SRCS
add_library(ktexteditor SHARED ${ktexteditor_LIB_SRCS}) add_library(ktexteditor SHARED ${ktexteditor_LIB_SRCS})
target_link_libraries(ktexteditor target_link_libraries(ktexteditor
${KDE4_KDECORE_LIBS}
${KDE4_KPARTS_LIBS}
${KDE4_KEMAIL_LIBS}
${QT_QTDBUS_LIBRARY} ${QT_QTDBUS_LIBRARY}
kdecore
kparts
kemail
) )
set_target_properties(ktexteditor PROPERTIES set_target_properties(ktexteditor PROPERTIES

View file

@ -38,10 +38,10 @@ set_target_properties(kdeclarative PROPERTIES
) )
target_link_libraries(kdeclarative PUBLIC target_link_libraries(kdeclarative PUBLIC
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${QT_QTSCRIPT_LIBRARY} ${QT_QTSCRIPT_LIBRARY}
${QT_QTDECLARATIVE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
kdecore
kdeui
) )
if(ENABLE_TESTING) if(ENABLE_TESTING)

View file

@ -197,7 +197,7 @@ configure_file(
add_executable(kde4-config kde-config.cpp ) add_executable(kde4-config kde-config.cpp )
target_link_libraries(kde4-config ${KDE4_KDECORE_LIBS}) target_link_libraries(kde4-config kdecore)
install( install(
TARGETS kde4-config TARGETS kde4-config

View file

@ -4,13 +4,13 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
MACRO(KDECORE_UNIT_TESTS) MACRO(KDECORE_UNIT_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
kde4_add_test(kdecore-${_testname} ${_testname}.cpp) 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) ENDFOREACH(_testname)
ENDMACRO(KDECORE_UNIT_TESTS) ENDMACRO(KDECORE_UNIT_TESTS)
MACRO(KDECORE_EXECUTABLE_TESTS) MACRO(KDECORE_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
kde4_add_manual_test(kdecore-${_testname} ${_testname}.cpp) 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) ENDFOREACH(_testname)
ENDMACRO(KDECORE_EXECUTABLE_TESTS) ENDMACRO(KDECORE_EXECUTABLE_TESTS)
@ -71,46 +71,46 @@ KDECORE_EXECUTABLE_TESTS(
# compile KEntryMap into the test since it's not exported # compile KEntryMap into the test since it's not exported
set(kentrymaptest_SRCS kentrymaptest.cpp ../config/kconfigdata.cpp) set(kentrymaptest_SRCS kentrymaptest.cpp ../config/kconfigdata.cpp)
kde4_add_test(kdecore-kentrymaptest ${kentrymaptest_SRCS}) 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 ############### ########### klocaletest ###############
# compile into the test since it's not exported # compile into the test since it's not exported
set(klocaletest_SRCS klocaletest.cpp ../date/kdayperiod.cpp) set(klocaletest_SRCS klocaletest.cpp ../date/kdayperiod.cpp)
kde4_add_test(kdecore-klocaletest ${klocaletest_SRCS}) 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 ############### ########### kdatetimeformattertest ###############
# compile KDateTimeFormatter and KDayPeriod into the test since it's not exported # compile KDateTimeFormatter and KDayPeriod into the test since it's not exported
set(kdatetimeformattertest_SRCS kdatetimeformattertest.cpp ../date/kdatetimeformatter.cpp ../date/kdayperiod.cpp) set(kdatetimeformattertest_SRCS kdatetimeformattertest.cpp ../date/kdatetimeformatter.cpp ../date/kdayperiod.cpp)
kde4_add_test(kdecore-kdatetimeformattertest ${kdatetimeformattertest_SRCS}) 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 ############### ########### kmimetypetest ###############
# compile kmimemagicrule.cpp into the test since it's not exported and we call match(). # compile kmimemagicrule.cpp into the test since it's not exported and we call match().
set(kmimetypetest_SRCS kmimetypetest.cpp ../services/kmimemagicrule.cpp) set(kmimetypetest_SRCS kmimetypetest.cpp ../services/kmimemagicrule.cpp)
kde4_add_test(kdecore-kmimetypetest ${kmimetypetest_SRCS}) 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 ############### ########### kmimeglobsfileparsertest ###############
# compile kmimeglobsfileparser.cpp into the test since it's not exported # compile kmimeglobsfileparser.cpp into the test since it's not exported
set(kmimeglobsfileparsertest_SRCS kmimeglobsfileparsertest.cpp ../services/kmimeglobsfileparser.cpp) set(kmimeglobsfileparsertest_SRCS kmimeglobsfileparsertest.cpp ../services/kmimeglobsfileparser.cpp)
kde4_add_test(kdecore-kmimeglobsfileparsertest ${kmimeglobsfileparsertest_SRCS}) 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 ############### ########### 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}) 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 ############### ########### kcompositejobtest ###############
set(kcompositejobtest_SRCS kcompositejobtest.cpp) set(kcompositejobtest_SRCS kcompositejobtest.cpp)
kde4_add_test(kdecore-kcompositejobtest ${kcompositejobtest_SRCS}) 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)

View file

@ -26,7 +26,10 @@ set(kded_SRCS
add_executable(kded4 ${kded_SRCS}) add_executable(kded4 ${kded_SRCS})
target_link_libraries(kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) target_link_libraries(kded4
${X11_LIBRARIES}
kio
)
install( install(
TARGETS kded4 TARGETS kded4
@ -56,9 +59,9 @@ set(kbuildsycoca_SRCS
) )
if(KBUILDSYCOCA_NO_KCRASH) if(KBUILDSYCOCA_NO_KCRASH)
set(KBUILDSYCOCA_MAIN_LIBS ${KDE4_KDECORE_LIBS}) set(KBUILDSYCOCA_MAIN_LIBS kdecore)
else() else()
set(KBUILDSYCOCA_MAIN_LIBS ${KDE4_KDEUI_LIBS}) set(KBUILDSYCOCA_MAIN_LIBS kdeui)
endif() endif()
add_executable(kbuildsycoca4 ${kbuildsycoca_SRCS}) add_executable(kbuildsycoca4 ${kbuildsycoca_SRCS})

View file

@ -6,5 +6,5 @@ set(kmimeassociationstest_SRCS kmimeassociationstest.cpp ../kmimeassociations.cp
kde4_add_test(kded-kmimeassociationstest ${kmimeassociationstest_SRCS}) 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)

View file

@ -107,6 +107,11 @@ set(kdeui_LIB_SRCS
dialogs/ksplashscreen.cpp dialogs/ksplashscreen.cpp
dialogs/kswitchlanguagedialog_p.cpp dialogs/kswitchlanguagedialog_p.cpp
dialogs/ktip.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/kfind.cpp
findreplace/kreplace.cpp findreplace/kreplace.cpp
findreplace/kfinddialog.cpp findreplace/kfinddialog.cpp
@ -160,6 +165,9 @@ set(kdeui_LIB_SRCS
notifications/kdbusmenuexporter.cpp notifications/kdbusmenuexporter.cpp
notifications/kdbusmenuimporter.cpp notifications/kdbusmenuimporter.cpp
notifications/kdbusmenu_p.cpp notifications/kdbusmenu_p.cpp
notifications/ksystemtrayicon.cpp
notifications/kstatusnotifieritem.cpp
notifications/kstatusnotifieritemdbus_p.cpp
paged/kpagedialog.cpp paged/kpagedialog.cpp
paged/kpageview.cpp paged/kpageview.cpp
paged/kpageview_p.cpp paged/kpageview_p.cpp
@ -196,6 +204,7 @@ set(kdeui_LIB_SRCS
util/kpixmapsequenceoverlaypainter.cpp util/kpixmapsequenceoverlaypainter.cpp
util/kpixmapsequencewidget.cpp util/kpixmapsequencewidget.cpp
util/kimageio.cpp util/kimageio.cpp
util/kkeyserver_x11.cpp
widgets/kactionselector.cpp widgets/kactionselector.cpp
widgets/kdialogbuttonbox.cpp widgets/kdialogbuttonbox.cpp
widgets/kbuttongroup.cpp widgets/kbuttongroup.cpp
@ -256,10 +265,9 @@ set(kdeui_LIB_SRCS
xmlgui/kxmlguifactory.cpp xmlgui/kxmlguifactory.cpp
xmlgui/kxmlguifactory_p.cpp xmlgui/kxmlguifactory_p.cpp
xmlgui/kxmlguiversionhandler.cpp xmlgui/kxmlguiversionhandler.cpp
dialogs/kdeprintdialog.cpp windowmanagement/kwindowsystem_x11.cpp
notifications/ksystemtrayicon.cpp windowmanagement/kwindowinfo_x11.cpp
notifications/kstatusnotifieritem.cpp windowmanagement/netwm.cpp
notifications/kstatusnotifieritemdbus_p.cpp
) )
qt4_add_dbus_interface(kdeui_LIB_SRCS qt4_add_dbus_interface(kdeui_LIB_SRCS
@ -273,21 +281,7 @@ qt4_add_dbus_adaptor(kdeui_LIB_SRCS
KStatusNotifierItemDBus KStatusNotifierItemDBus
) )
if(Q_WS_X11) if (X11_Xkb_FOUND AND X11_Xkbfile_FOUND)
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)
include_directories ( include_directories (
${X11_Xkb_INCLUDE_PATH} ${X11_Xkb_INCLUDE_PATH}
${X11_Xlib_INCLUDE_PATH} ${X11_Xlib_INCLUDE_PATH}
@ -342,15 +336,15 @@ add_library(kdeui SHARED ${kdeui_LIB_SRCS})
target_link_libraries(kdeui PRIVATE target_link_libraries(kdeui PRIVATE
${X11_LIBRARIES} ${X11_LIBRARIES}
${KDEUI_EXTRA_LIBS}
${ENCHANT_LIBRARIES} ${ENCHANT_LIBRARIES}
${KDEUI_EXTRA_LIBS}
) )
target_link_libraries(kdeui PUBLIC target_link_libraries(kdeui PUBLIC
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTXML_LIBRARY} ${QT_QTXML_LIBRARY}
${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIBRARY}
kdecore
) )
if(X11_XTest_FOUND) if(X11_XTest_FOUND)

View file

@ -11,9 +11,9 @@ MACRO(KDEUI_UNIT_TESTS)
kde4_add_test(kdeui-${_testname} ${_testname}.cpp) kde4_add_test(kdeui-${_testname} ${_testname}.cpp)
endif() endif()
target_link_libraries(kdeui-${_testname} target_link_libraries(kdeui-${_testname}
${KDE4_KDEUI_LIBS}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
${QT_QTXML_LIBRARY} ${QT_QTXML_LIBRARY}
kdeui
) )
ENDFOREACH(_testname) ENDFOREACH(_testname)
ENDMACRO(KDEUI_UNIT_TESTS) ENDMACRO(KDEUI_UNIT_TESTS)
@ -25,9 +25,9 @@ MACRO(KDEUI_EXECUTABLE_TESTS)
kde4_add_manual_test(kdeui-${_testname} ${_testname}.cpp) kde4_add_manual_test(kdeui-${_testname} ${_testname}.cpp)
endif() endif()
target_link_libraries(kdeui-${_testname} target_link_libraries(kdeui-${_testname}
${KDE4_KDEUI_LIBS}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
${QT_QTXML_LIBRARY} ${QT_QTXML_LIBRARY}
kdeui
) )
ENDFOREACH(_testname) ENDFOREACH(_testname)
ENDMACRO(KDEUI_EXECUTABLE_TESTS) ENDMACRO(KDEUI_EXECUTABLE_TESTS)
@ -154,4 +154,4 @@ set(kcolorUtilsDemoSources
../colors/kcolorspaces.cpp ../colors/kcolorspaces.cpp
) )
kde4_add_manual_test(kcolorutilsdemo ${kcolorUtilsDemoSources}) kde4_add_manual_test(kcolorutilsdemo ${kcolorUtilsDemoSources})
target_link_libraries(kcolorutilsdemo ${KDE4_KDEUI_LIBS}) target_link_libraries(kcolorutilsdemo kdeui)

View file

@ -9,7 +9,7 @@ macro(ADD_KCONFIG_TEST _testName)
kde4_add_manual_test(${_testName} ${_testSrc}) 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() endmacro()
########### next target ############### ########### next target ###############
@ -18,31 +18,31 @@ ADD_KCONFIG_TEST(test1 test1main.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test2 test2main.cpp ) ADD_KCONFIG_TEST(test2 test2main.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test3 test3main.cpp ) ADD_KCONFIG_TEST(test3 test3main.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test3a test3amain.cpp ) ADD_KCONFIG_TEST(test3a test3amain.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test4 test4main.cpp ) ADD_KCONFIG_TEST(test4 test4main.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test5 test5main.cpp ) ADD_KCONFIG_TEST(test5 test5main.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test6 test6main.cpp ) ADD_KCONFIG_TEST(test6 test6main.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test7 test7main.cpp ) ADD_KCONFIG_TEST(test7 test7main.cpp)
########### next target ############### ########### next target ###############
@ -53,42 +53,42 @@ kde4_add_kcfg_files(test8b test8_SRCS)
kde4_add_manual_test(test8 ${test8_SRCS}) kde4_add_manual_test(test8 ${test8_SRCS})
target_link_libraries(test8 ${KDE4_KDEUI_LIBS} ) target_link_libraries(test8 kdeui)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test9 test9main.cpp ) ADD_KCONFIG_TEST(test9 test9main.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test10 test10main.cpp ) ADD_KCONFIG_TEST(test10 test10main.cpp)
########### next target ############### ########### next target ###############
set(test11_SRCS test11main.cpp ) set(test11_SRCS test11main.cpp)
kde4_add_kcfg_files(test11 test11_SRCS) kde4_add_kcfg_files(test11 test11_SRCS)
kde4_add_kcfg_files(test11a test11_SRCS) kde4_add_kcfg_files(test11a test11_SRCS)
kde4_add_manual_test(test11 ${test11_SRCS}) kde4_add_manual_test(test11 ${test11_SRCS})
target_link_libraries(test11 ${KDE4_KDEUI_LIBS} ) target_link_libraries(test11 kdeui)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test12 test12main.cpp ) ADD_KCONFIG_TEST(test12 test12main.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test_dpointer test_dpointer_main.cpp ) ADD_KCONFIG_TEST(test_dpointer test_dpointer_main.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(test_signal test_signal_main.cpp ) ADD_KCONFIG_TEST(test_signal test_signal_main.cpp)
########### next target ############### ########### next target ###############
ADD_KCONFIG_TEST(kconfigcompiler_test kconfigcompiler_test.cpp ) ADD_KCONFIG_TEST(kconfigcompiler_test kconfigcompiler_test.cpp)

View file

@ -16,8 +16,7 @@ include_directories(
########### next target ############### ########### next target ###############
add_executable(makekdewidgets makekdewidgets.cpp) add_executable(makekdewidgets makekdewidgets.cpp)
target_link_libraries(makekdewidgets kdecore)
target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS})
install( install(
TARGETS makekdewidgets TARGETS makekdewidgets
@ -32,7 +31,7 @@ if(QT_QTUITOOLS_FOUND)
kde4_add_plugin(kdewidgets ${kdewidgets_SRCS}) kde4_add_plugin(kdewidgets ${kdewidgets_SRCS})
target_link_libraries(kdewidgets ${KDE4_KIO_LIBS} ${KDE4_KMEDIAPLAYER_LIBS}) target_link_libraries(kdewidgets kio kmediaplayer)
install( install(
TARGETS kdewidgets TARGETS kdewidgets

View file

@ -1,7 +1,2 @@
# TODO test programs # TODO test programs

View file

@ -44,10 +44,10 @@ set(kfile_LIB_SRCS
add_library(kfile SHARED ${kfile_LIB_SRCS}) add_library(kfile SHARED ${kfile_LIB_SRCS})
target_link_libraries(kfile PUBLIC target_link_libraries(kfile PUBLIC
${KDE4_SOLID_LIBS} kdecore
${KDE4_KIO_LIBS} kdeui
${KDE4_KDEUI_LIBS} kio
${KDE4_KDECORE_LIBS} solid
) )
set_target_properties(kfile PROPERTIES set_target_properties(kfile PROPERTIES
@ -86,8 +86,8 @@ install(
kde4_add_plugin(kfilemodule kfilemodule.cpp) kde4_add_plugin(kfilemodule kfilemodule.cpp)
target_link_libraries(kfilemodule target_link_libraries(kfilemodule
${KDE4_KFILE_LIBS} kfile
${KDE4_KIO_LIBS} kio
) )
install( install(

View file

@ -2,10 +2,10 @@ MACRO(KFILE_UNIT_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
kde4_add_test(kfile-${_testname} ${_testname}.cpp) kde4_add_test(kfile-${_testname} ${_testname}.cpp)
target_link_libraries(kfile-${_testname} target_link_libraries(kfile-${_testname}
${KDE4_KFILE_LIBS}
${KDE4_KIO_LIBS}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
${QT_QTXML_LIBRARY} ${QT_QTXML_LIBRARY}
kfile
kio
) )
ENDFOREACH(_testname) ENDFOREACH(_testname)
ENDMACRO(KFILE_UNIT_TESTS) ENDMACRO(KFILE_UNIT_TESTS)
@ -13,8 +13,8 @@ MACRO(KFILE_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
KDE4_ADD_MANUAL_TEST(kfile-${_testname} ${_testname}.cpp) KDE4_ADD_MANUAL_TEST(kfile-${_testname} ${_testname}.cpp)
target_link_libraries(kfile-${_testname} target_link_libraries(kfile-${_testname}
${KDE4_KFILE_LIBS}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
kfile
) )
ENDFOREACH(_testname) ENDFOREACH(_testname)
ENDMACRO(KFILE_EXECUTABLE_TESTS) ENDMACRO(KFILE_EXECUTABLE_TESTS)

View file

@ -6,8 +6,8 @@ include_directories(${KDE4_KDEUI_INCLUDES})
kde4_add_plugin(kimg_ico ico.cpp) kde4_add_plugin(kimg_ico ico.cpp)
target_link_libraries(kimg_ico target_link_libraries(kimg_ico
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
kdecore
) )
set_target_properties(kimg_ico PROPERTIES set_target_properties(kimg_ico PROPERTIES
OUTPUT_NAME ico OUTPUT_NAME ico
@ -24,9 +24,9 @@ if(WEBP_FOUND)
include_directories(${WEBP_INCLUDES}) include_directories(${WEBP_INCLUDES})
kde4_add_plugin(kimg_webp webp.cpp) kde4_add_plugin(kimg_webp webp.cpp)
target_link_libraries(kimg_webp target_link_libraries(kimg_webp
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${WEBP_LIBRARIES} ${WEBP_LIBRARIES}
kdecore
) )
set_target_properties(kimg_webp PROPERTIES set_target_properties(kimg_webp PROPERTIES
OUTPUT_NAME webp OUTPUT_NAME webp
@ -44,9 +44,9 @@ if(LIBRAW_FOUND)
include_directories(${LIBRAW_INCLUDE_DIR}) include_directories(${LIBRAW_INCLUDE_DIR})
kde4_add_plugin(kimg_raw raw.cpp) kde4_add_plugin(kimg_raw raw.cpp)
target_link_libraries(kimg_raw target_link_libraries(kimg_raw
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${LIBRAW_LIBRARIES} ${LIBRAW_LIBRARIES}
kdecore
) )
set_target_properties(kimg_raw PROPERTIES set_target_properties(kimg_raw PROPERTIES
COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}"
@ -65,9 +65,9 @@ if(LIBJPEG_FOUND)
include_directories(${LIBJPEG_INCLUDE_DIR}) include_directories(${LIBJPEG_INCLUDE_DIR})
kde4_add_plugin(kimg_jpg jpg.cpp) kde4_add_plugin(kimg_jpg jpg.cpp)
target_link_libraries(kimg_jpg target_link_libraries(kimg_jpg
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${LIBJPEG_LIBRARIES} ${LIBJPEG_LIBRARIES}
kdecore
) )
set_target_properties(kimg_jpg PROPERTIES set_target_properties(kimg_jpg PROPERTIES
OUTPUT_NAME jpg OUTPUT_NAME jpg
@ -85,9 +85,9 @@ if(OPENJPEG_FOUND)
include_directories(${OPENJPEG_INCLUDE_DIR}) include_directories(${OPENJPEG_INCLUDE_DIR})
kde4_add_plugin(kimg_jp2 jp2.cpp) kde4_add_plugin(kimg_jp2 jp2.cpp)
target_link_libraries(kimg_jp2 target_link_libraries(kimg_jp2
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${OPENJPEG_LIBRARIES} ${OPENJPEG_LIBRARIES}
kdecore
) )
set_target_properties(kimg_jp2 PROPERTIES set_target_properties(kimg_jp2 PROPERTIES
OUTPUT_NAME jp2 OUTPUT_NAME jp2
@ -105,9 +105,9 @@ if(TIFF_FOUND)
include_directories(${TIFF_INCLUDE_DIRS}) include_directories(${TIFF_INCLUDE_DIRS})
kde4_add_plugin(kimg_tiff tiff.cpp) kde4_add_plugin(kimg_tiff tiff.cpp)
target_link_libraries(kimg_tiff target_link_libraries(kimg_tiff
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${TIFF_LIBRARIES} ${TIFF_LIBRARIES}
kdecore
) )
set_target_properties(kimg_tiff PROPERTIES set_target_properties(kimg_tiff PROPERTIES
OUTPUT_NAME tiff OUTPUT_NAME tiff

View file

@ -32,8 +32,8 @@ qt4_generate_dbus_interface(klauncher_adaptor.h org.kde.KLauncher.xml)
add_executable(klauncher4 ${klauncher_SRCS}) add_executable(klauncher4 ${klauncher_SRCS})
target_link_libraries(klauncher4 target_link_libraries(klauncher4
${KDE4_KDEUI_LIBS} kdeui
${KDE4_KIO_LIBS} kio
) )
kde4_add_dbus_service(org.kde.klauncher.service.in) kde4_add_dbus_service(org.kde.klauncher.service.in)

View file

@ -2,4 +2,4 @@ include_directories(${KDE4_KIO_INCLUDES})
kde4_add_manual_test(klaunchertest klaunchertest.cpp) kde4_add_manual_test(klaunchertest klaunchertest.cpp)
target_link_libraries(klaunchertest ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS}) target_link_libraries(klaunchertest kdecore kio)

View file

@ -132,12 +132,12 @@ set(kio_LIB_SRCS
add_library(kio SHARED ${kio_LIB_SRCS}) add_library(kio SHARED ${kio_LIB_SRCS})
target_link_libraries(kio PUBLIC target_link_libraries(kio PUBLIC
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KPASSWDSTORE_LIBS}
${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIBRARY}
${QT_QTXML_LIBRARY} ${QT_QTXML_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
kdecore
kdeui
kpasswdstore
) )
if(ACL_FOUND) if(ACL_FOUND)

View file

@ -2,8 +2,8 @@ set(kfilemetadata_exiv2_SRCS kfilemetadata_exiv2.cpp)
kde4_add_plugin(kfilemetadata_exiv2 ${kfilemetadata_exiv2_SRCS}) kde4_add_plugin(kfilemetadata_exiv2 ${kfilemetadata_exiv2_SRCS})
target_link_libraries(kfilemetadata_exiv2 target_link_libraries(kfilemetadata_exiv2
${KDE4_KIO_LIBS} kio
${KDE4_KEXIV2_LIBS} kexiv2
) )
install( install(
@ -23,8 +23,8 @@ if (FFMPEG_FOUND)
kde4_add_plugin(kfilemetadata_ffmpeg ${kfilemetadata_ffmpeg_SRCS}) kde4_add_plugin(kfilemetadata_ffmpeg ${kfilemetadata_ffmpeg_SRCS})
target_link_libraries(kfilemetadata_ffmpeg target_link_libraries(kfilemetadata_ffmpeg
${KDE4_KIO_LIBS}
${FFMPEG_LIBRARIES} ${FFMPEG_LIBRARIES}
kio
) )
install( install(
@ -45,8 +45,8 @@ if (TAGLIB_FOUND)
kde4_add_plugin(kfilemetadata_taglib ${kfilemetadata_taglib_SRCS}) kde4_add_plugin(kfilemetadata_taglib ${kfilemetadata_taglib_SRCS})
target_link_libraries(kfilemetadata_taglib target_link_libraries(kfilemetadata_taglib
${KDE4_KIO_LIBS}
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}
kio
) )
install( install(
@ -67,8 +67,8 @@ if (EPUB_FOUND)
kde4_add_plugin(kfilemetadata_epub ${kfilemetadata_epub_SRCS}) kde4_add_plugin(kfilemetadata_epub ${kfilemetadata_epub_SRCS})
target_link_libraries(kfilemetadata_epub target_link_libraries(kfilemetadata_epub
${KDE4_KIO_LIBS}
${EPUB_LIBRARIES} ${EPUB_LIBRARIES}
kio
) )
install( install(
@ -89,8 +89,8 @@ if (POPPLER_FOUND)
kde4_add_plugin(kfilemetadata_poppler ${kfilemetadata_poppler_SRCS}) kde4_add_plugin(kfilemetadata_poppler ${kfilemetadata_poppler_SRCS})
target_link_libraries(kfilemetadata_poppler target_link_libraries(kfilemetadata_poppler
${KDE4_KIO_LIBS}
${POPPLER_LIBRARIES} ${POPPLER_LIBRARIES}
kio
) )
install( install(
@ -111,8 +111,8 @@ if (LIBSPECTRE_FOUND)
kde4_add_plugin(kfilemetadata_spectre ${kfilemetadata_spectre_SRCS}) kde4_add_plugin(kfilemetadata_spectre ${kfilemetadata_spectre_SRCS})
target_link_libraries(kfilemetadata_spectre target_link_libraries(kfilemetadata_spectre
${KDE4_KIO_LIBS}
${LIBSPECTRE_LIBRARY} ${LIBSPECTRE_LIBRARY}
kio
) )
install( install(
@ -133,8 +133,8 @@ if (FREETYPE_FOUND)
kde4_add_plugin(kfilemetadata_freetype ${kfilemetadata_freetype_SRCS}) kde4_add_plugin(kfilemetadata_freetype ${kfilemetadata_freetype_SRCS})
target_link_libraries(kfilemetadata_freetype target_link_libraries(kfilemetadata_freetype
${KDE4_KIO_LIBS}
${FREETYPE_LIBRARIES} ${FREETYPE_LIBRARIES}
kio
) )
install( install(
@ -155,8 +155,8 @@ if (DJVULIBRE_FOUND)
kde4_add_plugin(kfilemetadata_djvulibre ${kfilemetadata_djvulibre_SRCS}) kde4_add_plugin(kfilemetadata_djvulibre ${kfilemetadata_djvulibre_SRCS})
target_link_libraries(kfilemetadata_djvulibre target_link_libraries(kfilemetadata_djvulibre
${KDE4_KIO_LIBS}
${DJVULIBRE_LIBRARY} ${DJVULIBRE_LIBRARY}
kio
) )
install( install(

View file

@ -6,7 +6,7 @@ include_directories(BEFORE ${CMAKE_SOURCE_DIR}/kio)
add_executable(kmailservice kmailservice.cpp) add_executable(kmailservice kmailservice.cpp)
target_link_libraries(kmailservice ${KDE4_KDECORE_LIBS}) target_link_libraries(kmailservice kdecore)
install( install(
TARGETS kmailservice TARGETS kmailservice
@ -21,7 +21,7 @@ install(
add_executable(ktelnetservice ktelnetservice.cpp) add_executable(ktelnetservice ktelnetservice.cpp)
target_link_libraries(ktelnetservice ${KDE4_KDEUI_LIBS}) target_link_libraries(ktelnetservice kdeui)
install( install(
TARGETS ktelnetservice TARGETS ktelnetservice

View file

@ -5,13 +5,13 @@ include_directories(${KDE4_KIO_INCLUDES})
MACRO(KIO_UNIT_TESTS) MACRO(KIO_UNIT_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
kde4_add_test(kio-${_testname} ${_testname}.cpp) 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) ENDFOREACH(_testname)
ENDMACRO(KIO_UNIT_TESTS) ENDMACRO(KIO_UNIT_TESTS)
MACRO(KIO_EXECUTABLE_TESTS) MACRO(KIO_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
kde4_add_manual_test(kio-${_testname} ${_testname}.cpp) 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) ENDFOREACH(_testname)
ENDMACRO(KIO_EXECUTABLE_TESTS) ENDMACRO(KIO_EXECUTABLE_TESTS)
@ -59,9 +59,9 @@ KIO_EXECUTABLE_TESTS(
set(kfstest_SRCS kfstest.cpp kfdtest.cpp) set(kfstest_SRCS kfstest.cpp kfdtest.cpp)
kde4_add_manual_test(kfstest ${kfstest_SRCS}) kde4_add_manual_test(kfstest ${kfstest_SRCS})
target_link_libraries(kfstest ${KDE4_KIO_LIBS}) target_link_libraries(kfstest kio)
########### kfilemetainfotest ############### ########### kfilemetainfotest ###############
kde4_add_test(kio-kfilemetainfotest kfilemetainfotest.cpp) 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)

View file

@ -14,7 +14,7 @@ set(kio_file_PART_SRCS file.cpp file_unix.cpp)
add_executable(kio_file ${kio_file_PART_SRCS}) 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) if(ACL_FOUND)
target_link_libraries(kio_file ${ACL_LIBS}) target_link_libraries(kio_file ${ACL_LIBS})

View file

@ -6,7 +6,7 @@ include_directories(${KDE4_KIO_INCLUDES})
add_executable(kio_ftp ftp.cpp) 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}) install(TARGETS kio_ftp DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})

View file

@ -10,9 +10,9 @@ include_directories(
add_executable(kio_http http.cpp) add_executable(kio_http http.cpp)
target_link_libraries(kio_http target_link_libraries(kio_http
${KDE4_KDECORE_LIBS}
${KDE4_KIO_LIBS}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
kdecore
kio
) )
install(TARGETS kio_http DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) install(TARGETS kio_http DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})

View file

@ -23,10 +23,10 @@ add_library(knotifyconfig SHARED ${knotifyconfig_LIB_SRCS})
# Needs KIO for KUrlRequester # Needs KIO for KUrlRequester
target_link_libraries(knotifyconfig PUBLIC target_link_libraries(knotifyconfig PUBLIC
${KDE4_KIO_LIBS}
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTDBUS_LIBRARY} ${QT_QTDBUS_LIBRARY}
kdecore
kio
) )
set_target_properties(knotifyconfig PROPERTIES set_target_properties(knotifyconfig PROPERTIES

View file

@ -9,4 +9,4 @@ set(knotifytest_SRCS main.cpp knotifytestwindow.cpp)
kde4_add_manual_test(knotifytest ${knotifytest_SRCS}) kde4_add_manual_test(knotifytest ${knotifytest_SRCS})
target_link_libraries(knotifytest ${KDE4_KIO_LIBS} knotifyconfig) target_link_libraries(knotifytest knotifyconfig kio)

View file

@ -25,9 +25,9 @@ set(kparts_LIB_SRCS
add_library(kparts SHARED ${kparts_LIB_SRCS}) add_library(kparts SHARED ${kparts_LIB_SRCS})
target_link_libraries(kparts PUBLIC target_link_libraries(kparts PUBLIC
${KDE4_KDECORE_LIBS} kdecore
${KDE4_KDEUI_LIBS} kdeui
${KDE4_KIO_LIBS} kio
) )
set_target_properties(kparts PROPERTIES set_target_properties(kparts PROPERTIES

View file

@ -10,7 +10,7 @@ set(kpartstest_SRCS
kde4_add_manual_test(kparts-kpartstest ${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 ############### ########### next target ###############
@ -22,19 +22,19 @@ set(normalktmtest_SRCS
kde4_add_manual_test(kparts-normalktmtest ${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 ############### ########### next target ###############
kde4_add_manual_test(kparts-partviewer partviewer.cpp) kde4_add_manual_test(kparts-partviewer partviewer.cpp)
target_link_libraries(kparts-partviewer ${KDE4_KPARTS_LIBS}) target_link_libraries(kparts-partviewer kparts)
########### next target ############### ########### next target ###############
kde4_add_plugin(notepadpart notepad.cpp) 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}/") 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) MACRO(KPARTS_UNIT_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
kde4_add_test(kparts-${_testname} ${_testname}.cpp) 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) ENDFOREACH(_testname)
ENDMACRO(KPARTS_UNIT_TESTS) ENDMACRO(KPARTS_UNIT_TESTS)
MACRO(KPARTS_EXECUTABLE_TESTS) MACRO(KPARTS_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
kde4_add_manual_test(kparts-${_testname} ${_testname}.cpp) 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) ENDFOREACH(_testname)
ENDMACRO(KPARTS_EXECUTABLE_TESTS) ENDMACRO(KPARTS_EXECUTABLE_TESTS)

View file

@ -15,7 +15,7 @@ target_link_libraries(kpty PRIVATE
) )
target_link_libraries(kpty PUBLIC target_link_libraries(kpty PUBLIC
${KDE4_KDECORE_LIBS} kdecore
) )
set_target_properties(kpty PROPERTIES set_target_properties(kpty PROPERTIES

View file

@ -2,4 +2,4 @@ include_directories(${KDE4_KPTY_INCLUDES})
kde4_add_test(kptyprocesstest kptyprocesstest.cpp) kde4_add_test(kptyprocesstest kptyprocesstest.cpp)
target_link_libraries(kptyprocesstest ${KDE4_KPTY_LIBS} ${QT_QTTEST_LIBRARY}) target_link_libraries(kptyprocesstest ${QT_QTTEST_LIBRARY} kpty)

View file

@ -49,21 +49,19 @@ set_source_files_properties(
add_library(kidletime SHARED ${kidletime_LIB_SRCS}) add_library(kidletime SHARED ${kidletime_LIB_SRCS})
target_link_libraries(kidletime PUBLIC target_link_libraries(kidletime PUBLIC
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
kdecore
kdeui
) )
if (Q_WS_X11) if(HAVE_XSCREENSAVER)
if(HAVE_XSCREENSAVER) target_link_libraries(kidletime PRIVATE ${X11_Xscreensaver_LIB})
target_link_libraries(kidletime PRIVATE ${X11_Xscreensaver_LIB}) endif()
endif()
if(HAVE_XSYNC) if(HAVE_XSYNC)
target_link_libraries(kidletime PRIVATE ${X11_Xext_LIB}) target_link_libraries(kidletime PRIVATE ${X11_Xext_LIB})
endif() endif()
target_link_libraries(kidletime PRIVATE ${X11_X11_LIB}) target_link_libraries(kidletime PRIVATE ${X11_X11_LIB})
endif (Q_WS_X11)
set_target_properties(kidletime PROPERTIES set_target_properties(kidletime PROPERTIES
VERSION ${GENERIC_LIB_VERSION} VERSION ${GENERIC_LIB_VERSION}
@ -104,9 +102,9 @@ set(kcmutils_LIB_SRCS
add_library(kcmutils SHARED ${kcmutils_LIB_SRCS}) add_library(kcmutils SHARED ${kcmutils_LIB_SRCS})
target_link_libraries(kcmutils PUBLIC target_link_libraries(kcmutils PUBLIC
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
kdecore
kdeui
) )
set_target_properties(kcmutils PROPERTIES set_target_properties(kcmutils PROPERTIES

View file

@ -22,7 +22,7 @@ set(karchive_LIB_SRCS
add_library(karchive SHARED ${karchive_LIB_SRCS}) add_library(karchive SHARED ${karchive_LIB_SRCS})
target_link_libraries(karchive PUBLIC target_link_libraries(karchive PUBLIC
${KDE4_KDECORE_LIBS} kdecore
) )
target_link_libraries(karchive PRIVATE target_link_libraries(karchive PRIVATE
${LIBDEFLATE_LIBRARIES} ${LIBDEFLATE_LIBRARIES}

View file

@ -6,14 +6,14 @@ include_directories(
kde4_add_test(karchive-karchivetest kde4_add_test(karchive-karchivetest
karchivetest.cpp 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 kde4_add_test(karchive-kcompressortest
kcompressortest.cpp 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 kde4_add_test(karchive-kdecompressortest
kdecompressortest.cpp kdecompressortest.cpp
) )
target_link_libraries(karchive-kdecompressortest ${KDE4_KARCHIVE_LIBS} ${QT_QTTEST_LIBRARY}) target_link_libraries(karchive-kdecompressortest ${QT_QTTEST_LIBRARY} karchive)

View file

@ -11,8 +11,8 @@ set(kdnssd_LIB_SRCS
add_library(kdnssd SHARED ${kdnssd_LIB_SRCS}) add_library(kdnssd SHARED ${kdnssd_LIB_SRCS})
target_link_libraries(kdnssd PUBLIC target_link_libraries(kdnssd PUBLIC
${KDE4_KDECORE_LIBS}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
kdecore
) )
if(AVAHI_FOUND) if(AVAHI_FOUND)

View file

@ -15,9 +15,9 @@ set(kemail_LIB_SRCS
add_library(kemail SHARED ${kemail_LIB_SRCS}) add_library(kemail SHARED ${kemail_LIB_SRCS})
target_link_libraries(kemail PUBLIC target_link_libraries(kemail PUBLIC
${KDE4_KDECORE_LIBS} kdecore
${KDE4_KDEUI_LIBS} kdeui
${KDE4_KPASSWDSTORE_LIBS} kpasswdstore
) )
target_link_libraries(kemail PRIVATE ${CURL_LIBRARIES}) target_link_libraries(kemail PRIVATE ${CURL_LIBRARIES})

View file

@ -12,8 +12,8 @@ set(kexiv2_LIB_SRCS
add_library(kexiv2 SHARED ${kexiv2_LIB_SRCS}) add_library(kexiv2 SHARED ${kexiv2_LIB_SRCS})
target_link_libraries(kexiv2 PUBLIC target_link_libraries(kexiv2 PUBLIC
${KDE4_KDECORE_LIBS} kdecore
${KDE4_KDEUI_LIBS} kdeui
) )
if(EXIV2_FOUND) if(EXIV2_FOUND)

View file

@ -6,4 +6,4 @@ include_directories(
kde4_add_test(kexiv2-kexiv2test kde4_add_test(kexiv2-kexiv2test
kexiv2test.cpp kexiv2test.cpp
) )
target_link_libraries(kexiv2-kexiv2test ${KDE4_KEXIV2_LIBS} ${QT_QTTEST_LIBRARY}) target_link_libraries(kexiv2-kexiv2test ${QT_QTTEST_LIBRARY} kexiv2)

View file

@ -18,8 +18,8 @@ set(kmediaplayer_LIB_SRCS
add_library(kmediaplayer SHARED ${kmediaplayer_LIB_SRCS}) add_library(kmediaplayer SHARED ${kmediaplayer_LIB_SRCS})
target_link_libraries(kmediaplayer PUBLIC target_link_libraries(kmediaplayer PUBLIC
${KDE4_KDECORE_LIBS} kdecore
${KDE4_KDEUI_LIBS} kdeui
) )
if(MPV_FOUND) if(MPV_FOUND)

View file

@ -8,7 +8,7 @@ set(kded_kaudioplayer_SRCS
qt4_generate_dbus_interface(kaudioplayer.h org.kde.kaudioplayer.xml ) qt4_generate_dbus_interface(kaudioplayer.h org.kde.kaudioplayer.xml )
kde4_add_plugin(kded_kaudioplayer ${kded_kaudioplayer_SRCS}) kde4_add_plugin(kded_kaudioplayer ${kded_kaudioplayer_SRCS})
target_link_libraries(kded_kaudioplayer ${KDE4_KMEDIAPLAYER_LIBS}) target_link_libraries(kded_kaudioplayer kmediaplayer)
install( install(
TARGETS kded_kaudioplayer TARGETS kded_kaudioplayer

View file

@ -6,5 +6,5 @@ foreach(mantest media)
kde4_add_manual_test(kmediaplayer-${mantest} kde4_add_manual_test(kmediaplayer-${mantest}
k${mantest}widgettest.cpp k${mantest}widgettest.cpp
) )
target_link_libraries(kmediaplayer-${mantest} ${KDE4_KMEDIAPLAYER_LIBS}) target_link_libraries(kmediaplayer-${mantest} kmediaplayer)
endforeach() endforeach()

View file

@ -19,9 +19,9 @@ set(kpasswdstore_LIB_SRCS
add_library(kpasswdstore SHARED ${kpasswdstore_LIB_SRCS}) add_library(kpasswdstore SHARED ${kpasswdstore_LIB_SRCS})
target_link_libraries(kpasswdstore PUBLIC target_link_libraries(kpasswdstore PUBLIC
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${QT_QTDBUS_LIBRARY} ${QT_QTDBUS_LIBRARY}
kdecore
kdeui
) )
set_target_properties(kpasswdstore PROPERTIES set_target_properties(kpasswdstore PROPERTIES

View file

@ -10,8 +10,8 @@ qt4_generate_dbus_interface(kded_kpasswdstore.h org.kde.kpasswdstore.xml )
kde4_add_plugin(kded_kpasswdstore ${kded_kpasswdstore_SRCS}) kde4_add_plugin(kded_kpasswdstore ${kded_kpasswdstore_SRCS})
target_link_libraries(kded_kpasswdstore PRIVATE target_link_libraries(kded_kpasswdstore PRIVATE
${KDE4_KDECORE_LIBS} kdecore
${KDE4_KDEUI_LIBS} kdeui
) )
if(OPENSSL_FOUND) if(OPENSSL_FOUND)

View file

@ -3,9 +3,9 @@ include_directories(
) )
kde4_add_manual_test(kpasswdstore-manual kpasswdstoretest.cpp) 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 kde4_add_manual_test(kpasswdroulettedialog-manual
kpasswdroulettedialog-manual.cpp kpasswdroulettedialog-manual.cpp
) )
target_link_libraries(kpasswdroulettedialog-manual ${KDE4_KPASSWDSTORE_LIBS}) target_link_libraries(kpasswdroulettedialog-manual kpasswdstore)

View file

@ -13,8 +13,8 @@ set(kpowermanager_LIB_SRCS
add_library(kpowermanager SHARED ${kpowermanager_LIB_SRCS}) add_library(kpowermanager SHARED ${kpowermanager_LIB_SRCS})
target_link_libraries(kpowermanager PUBLIC target_link_libraries(kpowermanager PUBLIC
${KDE4_KDECORE_LIBS}
${QT_QTDBUS_LIBRARY} ${QT_QTDBUS_LIBRARY}
kdecore
) )
set_target_properties(kpowermanager PROPERTIES set_target_properties(kpowermanager PROPERTIES
@ -54,7 +54,9 @@ set(kpowermanager_helper_srcs
) )
add_executable(kpowermanager_helper ${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( install(
TARGETS kpowermanager_helper TARGETS kpowermanager_helper

View file

@ -23,9 +23,9 @@ qt4_generate_dbus_interface(kded_kpowermanager.h org.kde.kpowermanager.xml)
kde4_add_plugin(kded_kpowermanager ${kded_kpowermanager_SRCS}) kde4_add_plugin(kded_kpowermanager ${kded_kpowermanager_SRCS})
target_link_libraries(kded_kpowermanager PRIVATE target_link_libraries(kded_kpowermanager PRIVATE
${KDE4_KDECORE_LIBS}
${KDE4_KPOWERMANAGER_LIBS}
${QT_QTDBUS_LIBRARY} ${QT_QTDBUS_LIBRARY}
kdecore
kpowermanager
) )
install( install(

View file

@ -18,18 +18,18 @@ include_directories(
if(NOT PLASMA_NO_KIO) if(NOT PLASMA_NO_KIO)
include_directories(${KDE4_KIO_INCLUDES}) include_directories(${KDE4_KIO_INCLUDES})
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KIO_LIBS}) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} kio)
endif() endif()
if(NOT PLASMA_NO_SOLID) if(NOT PLASMA_NO_SOLID)
include_directories(${CMAKE_BINARY_DIR}/solid/) include_directories(${CMAKE_BINARY_DIR}/solid/)
include_directories(${CMAKE_SOURCE_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() endif()
if(NOT PLASMA_NO_KUTILS) if(NOT PLASMA_NO_KUTILS)
include_directories(${CMAKE_SOURCE_DIR}/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() endif()
configure_file( configure_file(
@ -159,10 +159,10 @@ target_link_libraries(plasma PUBLIC
${QT_QTXML_LIBRARY} ${QT_QTXML_LIBRARY}
${QT_QTSVG_LIBRARY} ${QT_QTSVG_LIBRARY}
${QT_QTDECLARATIVE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KDECLARATIVE_LIBS}
${PLASMA_EXTRA_LIBS} ${PLASMA_EXTRA_LIBS}
kdecore
kdeui
kdeclarative
) )
target_link_libraries(plasma PRIVATE ${X11_LIBRARIES}) target_link_libraries(plasma PRIVATE ${X11_LIBRARIES})

View file

@ -2,11 +2,11 @@ MACRO(PLASMA_UNIT_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
kde4_add_test(plasma-${_testname} ${_testname}.cpp) kde4_add_test(plasma-${_testname} ${_testname}.cpp)
target_link_libraries(plasma-${_testname} target_link_libraries(plasma-${_testname}
${KDE4_KIO_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_PLASMA_LIBS}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
${QT_QTDECLARATIVE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
kio
kdeui
plasma
) )
ENDFOREACH(_testname) ENDFOREACH(_testname)
ENDMACRO(PLASMA_UNIT_TESTS) ENDMACRO(PLASMA_UNIT_TESTS)

View file

@ -166,7 +166,7 @@ if(UDEV_FOUND)
Support for m-p-i is included even if not found during build" 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) endif(UDEV_FOUND)
if(DEVINFO_FOUND) if(DEVINFO_FOUND)

View file

@ -13,11 +13,11 @@ include_directories(
kde4_add_test(solid-fakehardwaretest fakehardwaretest.cpp) kde4_add_test(solid-fakehardwaretest fakehardwaretest.cpp)
target_link_libraries(solid-fakehardwaretest target_link_libraries(solid-fakehardwaretest
${KDE4_SOLID_LIBS}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTDBUS_LIBRARY} ${QT_QTDBUS_LIBRARY}
${QT_QTXML_LIBRARY} ${QT_QTXML_LIBRARY}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
solid
) )
add_definitions(-DTEST_DATA="${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw/fakecomputer.xml") 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_QTDBUS_LIBRARY}
${QT_QTXML_LIBRARY} ${QT_QTXML_LIBRARY}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
${KDE4_SOLID_LIBS} solid
) )
########### solidnettestdbusservice ############### ########### solidnettestdbusservice ###############
@ -63,4 +63,4 @@ qt4_add_dbus_interface(networkingclient_SRCS
kde4_add_manual_test(solid-networkingclient ${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)