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

Reduce KDE4 usage in cmake setup

Browse Source
This commit is contained in:
Sebastian Kügler 2013-08-09 05:22:20 +02:00
parent db9b0016d1
commit fd3f1eaa35
14 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/declarativeimports/core/CMakeLists.txt
View File

@ -32,7 +32,7 @@ target_link_libraries(corebindingsplugin
${Qt5Qml_LIBRARIES}
${KDECLARATIVE_LIBRARIES}
${KDE4_KDEUI_LIBS}
${KDE4_KDECORE_LIBS}
${KCore_LIBRARIES}
plasma)
install(TARGETS corebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)

1
src/declarativeimports/core/tests/CMakeLists.txt
View File

@ -18,6 +18,7 @@ target_link_libraries(sortfiltermodeltest
${KDE4Support_LIBRARIES}
${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY}
${KI18n_LIBRARIES}
)

4
src/declarativeimports/krunnermodel/CMakeLists.txt
View File

@ -9,7 +9,9 @@ add_library(runnermodelplugin SHARED ${runnermodel_SRCS})
target_link_libraries(runnermodelplugin
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
plasma)
${KI18n_LIBRARIES}
plasma
)
install(TARGETS runnermodelplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/runnermodel)

2
src/declarativeimports/locale/CMakeLists.txt
View File

@ -19,7 +19,7 @@ target_link_libraries(localebindingsplugin
${QT_QTCORE_LIBRARY}
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
${KDE4_KDECORE_LIBS}
${KCore_LIBRARIES}
KF5::KDE4Attic
)
install(TARGETS localebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/locale)

4
src/declarativeimports/qtextracomponents/tests/CMakeLists.txt
View File

@ -7,8 +7,10 @@ target_link_libraries(fullmodelaccesstest
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY}
${KDE4_KDECORE_LIBS}
${KCore_LIBRARIES}
${KDE4Support_LIBRARIES}
${KI18n_LIBRARIES}
)
add_test(plasma-fullmodelaccesstest fullmodelaccesstest)

4
src/kpart/CMakeLists.txt
View File

@ -13,9 +13,9 @@ set(plasma_kpart_SRCS
plasmakpart.cpp
)
kde4_add_plugin(plasma-kpart ${plasma_kpart_SRCS})
plasma_add_plugin(plasma-kpart ${plasma_kpart_SRCS})
target_link_libraries(plasma-kpart ${QT_QTSCRIPT_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} )
target_link_libraries(plasma-kpart ${QT_QTSCRIPT_LIBRARY} ${Plasma_LIBRARIES} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} )
install(TARGETS plasma-kpart DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-kpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})

2
src/plasma/CMakeLists.txt
View File

@ -162,7 +162,7 @@ if(DL_LIBRARY)
target_link_libraries(plasma ${DL_LIBRARY})
endif(DL_LIBRARY)
target_link_libraries(plasma LINK_INTERFACE_LIBRARIES ${KDE4_KDECORE_LIBS} Qt5::Widgets)
target_link_libraries(plasma LINK_INTERFACE_LIBRARIES ${KCore_LIBRARIES} Qt5::Widgets)
#do NOT use GENERIC versioning -- the plasma team will take care of versioning
set_target_properties(plasma PROPERTIES

2
src/plasma/tests/kplugins/CMakeLists.txt
View File

@ -5,7 +5,7 @@ add_executable(plugintest
plugintest.cpp
)
target_link_libraries(plugintest kdeqt5staging plasma)
target_link_libraries(plugintest kdeqt5staging plasma ${KI18n_LIBRARIES} ${KService_LIBRARIES} )
message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}")

4
src/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt
View File

@ -15,8 +15,8 @@ set(test_SRCS
)
kde4_add_ui_files(test_SRCS config.ui)
kde4_add_plugin(plasma_containmentactions_test ${test_SRCS})
target_link_libraries(plasma_containmentactions_test ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
plasma_add_plugin(plasma_containmentactions_test ${test_SRCS})
target_link_libraries(plasma_containmentactions_test ${Plasma_LIBRARIES} ${KDE4_KIO_LIBS})
install(TARGETS plasma_containmentactions_test DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-containmentactions-test.desktop DESTINATION ${SERVICES_INSTALL_DIR})

4
src/plasma/tests/testengine/CMakeLists.txt
View File

@ -11,12 +11,12 @@ include_directories(${CMAKE_SOURCE_DIR}
set(testengine_engine_SRCS
testengine.cpp)
kde4_add_plugin(plasma_engine_testengine
plasma_add_plugin(plasma_engine_testengine
${testengine_engine_SRCS})
target_link_libraries(plasma_engine_testengine
${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS})
${Plasma_LIBRARIES})
install(TARGETS plasma_engine_testengine DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-dataengine-testengine.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

2
src/plasmapkg/CMakeLists.txt
View File

@ -5,7 +5,7 @@ add_executable(plasmapkg
plasmapkg.cpp
)
target_link_libraries(plasmapkg kdeqt5staging plasma)
target_link_libraries(plasmapkg kdeqt5staging plasma ${KI18n_LIBRARIES} ${KService_LIBRARIES} )
message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}")

1
src/platformstatus/CMakeLists.txt
View File

@ -20,6 +20,7 @@ target_link_libraries(
${KService_LIBRARIES}
${KCoreAddons_LIBRARIES}
${KDBusAddons_LIBRARIES}
${KI18n_LIBRARIES}
Qt5::DBus
Qt5::Quick
)

22
src/scriptengines/javascript/CMakeLists.txt
View File

@ -49,12 +49,12 @@ set(simple_javascript_engine_SRCS
include_directories(${PHONON_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/common)
kde4_add_plugin(plasma_appletscript_simple_javascript ${simple_javascript_engine_SRCS})
plasma_add_plugin(plasma_appletscript_simple_javascript ${simple_javascript_engine_SRCS})
target_link_libraries(plasma_appletscript_simple_javascript
${KDE4_KDECORE_LIBS}
${KCore_LIBRARIES}
${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS}
${Plasma_LIBRARIES}
${QT_QTDECLARATIVE_LIBRARY}
${QT_QTSCRIPT_LIBRARY}
${QT_QTUITOOLS_LIBRARY}
@ -75,12 +75,12 @@ set(javascript_runner_engine_SRCS
simplebindings/i18n.cpp
)
kde4_add_plugin(plasma_runnerscript_javascript ${javascript_runner_engine_SRCS})
plasma_add_plugin(plasma_runnerscript_javascript ${javascript_runner_engine_SRCS})
target_link_libraries(plasma_runnerscript_javascript
${KDE4_KDECORE_LIBS}
${KCore_LIBRARIES}
${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS}
${Plasma_LIBRARIES}
${QT_QTSCRIPT_LIBRARY})
install(TARGETS plasma_runnerscript_javascript DESTINATION ${PLUGIN_INSTALL_DIR})
@ -100,12 +100,12 @@ set(javascript_dataengine_engine_SRCS
simplebindings/i18n.cpp
simplebindings/qscriptnonguibookkeeping.cpp
)
kde4_add_plugin(plasma_dataenginescript_javascript ${javascript_dataengine_engine_SRCS})
plasma_add_plugin(plasma_dataenginescript_javascript ${javascript_dataengine_engine_SRCS})
target_link_libraries(plasma_dataenginescript_javascript
${KDE4_KDECORE_LIBS}
${KCore_LIBRARIES}
${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS}
${Plasma_LIBRARIES}
${QT_QTSCRIPT_LIBRARY})
install(TARGETS plasma_dataenginescript_javascript DESTINATION ${PLUGIN_INSTALL_DIR})
@ -118,8 +118,8 @@ set(javascript_addon_packagestructure_SRCS
common/javascriptaddonpackagestructure.cpp
)
kde4_add_plugin(plasma_packagestructure_javascriptaddon ${javascript_addon_packagestructure_SRCS})
target_link_libraries(plasma_packagestructure_javascriptaddon ${KDE4_PLASMA_LIBS})
plasma_add_plugin(plasma_packagestructure_javascriptaddon ${javascript_addon_packagestructure_SRCS})
target_link_libraries(plasma_packagestructure_javascriptaddon ${Plasma_LIBRARIES})
install(TARGETS plasma_packagestructure_javascriptaddon DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES data/plasma-packagestructure-javascript-addon.desktop DESTINATION ${SERVICES_INSTALL_DIR})

2
src/shell/CMakeLists.txt
View File

@ -75,7 +75,7 @@ target_link_libraries(plasma-shell
#${Qt5Widgets_LIBRARIES}
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
${KDE4_KDECORE_LIBS}
${KCore_LIBRARIES}
${KDE4_KIO_LIBS}
${KWindowSystem_LIBRARIES}
${KCoreAddons_LIBRARIES}