alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmake fixes

Browse Source 
- finally remove KDE4_KIO_LIBS
- change KDeclarative to KF5::KDeclarative
- add KService where needed
This commit is contained in:
Sebastian Kügler 2013-10-04 19:18:34 +02:00
parent 1891066fc2
commit b2121c1e06
9 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -52,7 +52,7 @@ find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver
KConfig KAuth KJS KWallet KDBusAddons KI18n KGuiAddons KConfigWidgets KConfig KAuth KJS KWallet KDBusAddons KI18n KGuiAddons KConfigWidgets
KService ItemViews KNotifications KIconThemes KCompletion KJobWidgets KConfigWidgets Sonnet KTextWidgets XmlGui KCrash KService ItemViews KNotifications KIconThemes KCompletion KJobWidgets KConfigWidgets Sonnet KTextWidgets XmlGui KCrash
KIO KUnitConversion KDE4Attic KBookmarks) KIO KUnitConversion KDE4Attic KBookmarks)
#find_package(KF5Transitional REQUIRED) #find_package(KF5Transitional REQUIRED)
# those are not "done" yet: # those are not "done" yet:

4
examples/dataengines/customDataContainers/CMakeLists.txt
View File

@ -8,8 +8,8 @@ kservice_desktop_to_json(plasma-dataengine-example-customDataContainers.desktop)
plasma_add_plugin(plasma_dataengine_example_customDataContainers ${customDataContainers_SRCS}) plasma_add_plugin(plasma_dataengine_example_customDataContainers ${customDataContainers_SRCS})
target_link_libraries(plasma_dataengine_example_customDataContainers target_link_libraries(plasma_dataengine_example_customDataContainers
plasma plasma
${KService_LIBRARIES} KF5::KIOCore
${KDE4_KIO_LIBS} KF5::KService
) )
install(TARGETS plasma_dataengine_example_customDataContainers DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS plasma_dataengine_example_customDataContainers DESTINATION ${PLUGIN_INSTALL_DIR})

3
src/declarativeimports/dirmodel/CMakeLists.txt
View File

@ -10,7 +10,8 @@ add_library(dirmodelplugin SHARED ${dirmodel_SRCS})
target_link_libraries(dirmodelplugin target_link_libraries(dirmodelplugin
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${Qt5Qml_LIBRARIES} ${Qt5Qml_LIBRARIES}
${KDE4_KIO_LIBS} KF5::KIOCore
KF5::KIOWidgets
${KDE4Support_LIBRARIES} ${KDE4Support_LIBRARIES}
KF5::KGuiAddons KF5::KGuiAddons
) )

7
src/plasma/CMakeLists.txt
View File

@ -37,7 +37,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
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})
endif(NOT PLASMA_NO_KIO) endif(NOT PLASMA_NO_KIO)
if(NOT PLASMA_NO_SOLID) if(NOT PLASMA_NO_SOLID)
@ -149,13 +149,16 @@ target_link_libraries(plasma
KF5::KGuiAddons KF5::KGuiAddons
KF5::KIconThemes KF5::KIconThemes
KF5::KI18n KF5::KI18n
KF5::KService
KF5::KIOCore
KF5::KIOWidgets
KF5::KDE4Attic KF5::KDE4Attic
Qt5::UiTools Qt5::UiTools
${KDE4Attic_LIBRARIES} ${KDE4Attic_LIBRARIES}
${KDE4Support_LIBRARIES} # needed for KStandardDirs and KGlobal ${KDE4Support_LIBRARIES} # needed for KStandardDirs and KGlobal
) )
#FIXME gpgme++ is in kdepimlibs, needs to be elsewhere #FIXME gpgme++ is in kdepimlibs, needs to be elsewhere
target_link_libraries(plasma KDeclarative ${KArchive_LIBRARIES}) target_link_libraries(plasma KF5::KDeclarative ${KArchive_LIBRARIES})
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(plasma Qt5::X11Extras ${X11_LIBRARIES}) target_link_libraries(plasma Qt5::X11Extras ${X11_LIBRARIES})

5
src/plasma/autotests/CMakeLists.txt
View File

@ -14,9 +14,10 @@ MACRO(PLASMA_UNIT_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
add_executable(${_testname} ${_testname}.cpp) add_executable(${_testname} ${_testname}.cpp)
target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
${KDE4_KIO_LIBS} plasma ${KArchive_LIBRARIES} ${KCoreAddons_LIBRARIES} plasma ${KArchive_LIBRARIES} ${KCoreAddons_LIBRARIES}
KF5::KConfigGui KF5::KConfigGui
KF5::KI18n KF5::KI18n
KF5::KIOCore
KF5::KService) KF5::KService)
if(QT_QTOPENGL_FOUND) if(QT_QTOPENGL_FOUND)
target_link_libraries(${_testname} ${QT_QTOPENGL_LIBRARY}) target_link_libraries(${_testname} ${QT_QTOPENGL_LIBRARY})
@ -35,7 +36,7 @@ PLASMA_UNIT_TESTS(
) )
add_executable(storagetest storagetest.cpp ../private/storage.cpp ../private/storagethread.cpp) add_executable(storagetest storagetest.cpp ../private/storage.cpp ../private/storagethread.cpp)
target_link_libraries(storagetest ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTSQL_LIBRARY} ${KDE4_KIO_LIBS} plasma ${KCoreAddons_LIBRARIES} ) target_link_libraries(storagetest ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTSQL_LIBRARY} KF5::KIOCore plasma ${KCoreAddons_LIBRARIES} )
add_test(plasma-storagetest storagetest) add_test(plasma-storagetest storagetest)
ecm_mark_as_test(plasma-storagetest) ecm_mark_as_test(plasma-storagetest)

2
src/plasmaquick/CMakeLists.txt
View File

@ -25,7 +25,7 @@ target_link_libraries(PlasmaQuick
${KCoreAddons_LIBRARIES} ${KCoreAddons_LIBRARIES}
${XmlGui_LIBRARIES} ${XmlGui_LIBRARIES}
plasma plasma
KDeclarative KF5::KDeclarative
) )
set_target_properties(PlasmaQuick PROPERTIES set_target_properties(PlasmaQuick PROPERTIES

2
src/platformstatus/CMakeLists.txt
View File

@ -20,8 +20,10 @@ target_link_libraries(
${KCoreAddons_LIBRARIES} ${KCoreAddons_LIBRARIES}
${KDBusAddons_LIBRARIES} ${KDBusAddons_LIBRARIES}
${KI18n_LIBRARIES} ${KI18n_LIBRARIES}
KF5::KIOCore KF5::KIOWidgets
Qt5::DBus Qt5::DBus
Qt5::Quick Qt5::Quick
#${KDE4_KIO_LIBS}
) )
install( TARGETS kded_platformstatus DESTINATION ${PLUGIN_INSTALL_DIR} ) install( TARGETS kded_platformstatus DESTINATION ${PLUGIN_INSTALL_DIR} )

5
src/scriptengines/qml/CMakeLists.txt
View File

@ -28,7 +28,8 @@ add_library(plasma_appletscript_declarative MODULE ${declarative_appletscript_SR
set_target_properties(plasma_appletscript_declarative PROPERTIES PREFIX "") set_target_properties(plasma_appletscript_declarative PROPERTIES PREFIX "")
target_link_libraries(plasma_appletscript_declarative target_link_libraries(plasma_appletscript_declarative
${KDE4_KIO_LIBS} KF5::KIOCore
KF5::KIOWidgets
${KDE4Support_LIBRARIES} ${KDE4Support_LIBRARIES}
${KDE4Attic_LIBRARIES} ${KDE4Attic_LIBRARIES}
${QT_QTSCRIPT_LIBRARY} ${QT_QTSCRIPT_LIBRARY}
@ -38,7 +39,7 @@ target_link_libraries(plasma_appletscript_declarative
${KCore_LIBRARIES} ${KCore_LIBRARIES}
KF5::KI18n KF5::KI18n
plasma plasma
KDeclarative KF5::KDeclarative
) )

4
src/shell/CMakeLists.txt
View File

@ -77,7 +77,7 @@ target_link_libraries(plasma-shell
${Qt5Quick_LIBRARIES} ${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES} ${Qt5Qml_LIBRARIES}
${KCore_LIBRARIES} ${KCore_LIBRARIES}
${KDE4_KIO_LIBS} KF5::KIOCore
${KWindowSystem_LIBRARIES} ${KWindowSystem_LIBRARIES}
${KCoreAddons_LIBRARIES} ${KCoreAddons_LIBRARIES}
plasma plasma
@ -85,7 +85,7 @@ target_link_libraries(plasma-shell
${Qt5Script_LIBRARIES} ${Qt5Script_LIBRARIES}
${KDE4Support_LIBRARIES} ${KDE4Support_LIBRARIES}
${Solid_LIBRARIES} ${Solid_LIBRARIES}
KDeclarative KF5::KDeclarative
KF5::KI18n KF5::KI18n
KF5::XmlGui KF5::XmlGui
) )