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

Fix linking

Browse Source 
KDEUI is dead which caused quite some collateral damage in our
CMakeLists.
This commit is contained in:
Martin Gräßlin 2013-08-20 07:47:09 +02:00
parent c3742a068c
commit 531e6c3db5
10 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,8 +31,10 @@ target_link_libraries(corebindingsplugin
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
${KDECLARATIVE_LIBRARIES}
${KDE4_KDEUI_LIBS}
${KCore_LIBRARIES}
${KDE4Support_LIBRARIES}
KF5::KIconThemes
KF5::KWindowSystem
plasma)
install(TARGETS corebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)

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

@ -12,6 +12,7 @@ target_link_libraries(dirmodelplugin
${Qt5Qml_LIBRARIES}
${KDE4_KIO_LIBS}
${KDE4Support_LIBRARIES}
KF5::KGuiAddons
)
install(TARGETS dirmodelplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/dirmodel)

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

@ -21,6 +21,7 @@ target_link_libraries(localebindingsplugin
${Qt5Qml_LIBRARIES}
${KCore_LIBRARIES}
KF5::KDE4Attic
KF5::KI18n
)
install(TARGETS localebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/locale)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/locale)

1
src/declarativeimports/plasmacomponents/CMakeLists.txt
View File

@ -27,7 +27,6 @@ target_link_libraries(plasmacomponentsplugin
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
${QT_QTGUI_LIBRARY}
${KDE4_KDEUI_LIBRARY}
${KDECLARATIVE_LIBRARIES}
plasma)

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

@ -24,8 +24,8 @@ target_link_libraries(qtextracomponentsplugin
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
${QT_QTGUI_LIBRARY}
${KDE4_KDEUI_LIBRARY}
${KDECLARATIVE_LIBRARIES}
KF5::KIconThemes
plasma)
install(TARGETS qtextracomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/qtextracomponents)

5
src/plasma/CMakeLists.txt
View File

@ -142,10 +142,13 @@ target_link_libraries(plasma
${QT_QTNETWORK_LIBRARY}
${QT_QTSQL_LIBRARY}
${Qt5Quick_LIBRARIES}
Qt5::Svg
${ThreadWeaver_LIBRARIES}
${KAuth_LIBRARIES}
${KWindowSystem_LIBRARIES}
${PLASMA_EXTRA_LIBS}
KF5::KGuiAddons
KF5::KIconThemes
KF5::KI18n
KF5::KDE4Attic
${KDE4Attic_LIBRARIES}
@ -155,7 +158,7 @@ target_link_libraries(plasma
target_link_libraries(plasma kdeclarative ${KArchive_LIBRARIES})
if(X11_FOUND)
target_link_libraries(plasma ${X11_LIBRARIES})
target_link_libraries(plasma Qt5::X11Extras ${X11_LIBRARIES})
endif(X11_FOUND)
if(DL_LIBRARY)

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

@ -14,7 +14,9 @@ MACRO(PLASMA_UNIT_TESTS)
FOREACH(_testname ${ARGN})
add_executable(${_testname} ${_testname}.cpp)
target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} plasma ${KArchive_LIBRARIES} ${KCoreAddons_LIBRARIES})
${KDE4_KIO_LIBS} plasma ${KArchive_LIBRARIES} ${KCoreAddons_LIBRARIES}
KF5::KConfigGui
KF5::KI18n)
if(QT_QTOPENGL_FOUND)
target_link_libraries(${_testname} ${QT_QTOPENGL_LIBRARY})
endif(QT_QTOPENGL_FOUND)

2
src/plasmapkg/CMakeLists.txt
View File

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

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

@ -35,6 +35,7 @@ target_link_libraries(plasma_appletscript_declarative
${Qt5Qml_LIBRARIES}
${QT_QTUITOOLS_LIBRARY}
${KCore_LIBRARIES}
KF5::KI18n
plasma
kdeclarative
)

3
src/shell/CMakeLists.txt
View File

@ -81,10 +81,11 @@ target_link_libraries(plasma-shell
${KCoreAddons_LIBRARIES}
plasma
${Qt5Script_LIBRARIES}
${KDE4_KDEUI_LIBS}
${KDE4Support_LIBRARIES}
${Solid_LIBRARIES}
kdeclarative
KF5::KI18n
KF5::XmlGui
)