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

Merge branch 'master' into sebas/kplugins

Browse Source
This commit is contained in:
Sebastian Kügler 2013-07-12 10:35:09 +02:00
commit 84cd704368
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -62,7 +62,6 @@ find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
#find_package(KF5Transitional REQUIRED) #find_package(KF5Transitional REQUIRED)
# those are not "done" yet: # those are not "done" yet:
find_package(kde4support REQUIRED NO_MODULE)
find_package(ktextwidgets REQUIRED NO_MODULE) find_package(ktextwidgets REQUIRED NO_MODULE)
find_package(ki18n REQUIRED NO_MODULE) find_package(ki18n REQUIRED NO_MODULE)
find_package(kio REQUIRED NO_MODULE) find_package(kio REQUIRED NO_MODULE)
@ -72,6 +71,9 @@ find_package(kdeclarative REQUIRED NO_MODULE)
# FIXME: remove when kdeui is fully split up # FIXME: remove when kdeui is fully split up
find_package(KDELibs4 REQUIRED NO_MODULE) find_package(KDELibs4 REQUIRED NO_MODULE)
# must be after KDELibs4, since it links against imported targets coming from KDELibs4Config.cmake:
find_package(KDE4Support REQUIRED NO_MODULE)
#optional features #optional features
find_package(X11 MODULE) find_package(X11 MODULE)
if(X11_FOUND) if(X11_FOUND)

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

@ -15,7 +15,7 @@ qt4_automoc(sortfiltermodeltest.cpp)
target_link_libraries(sortfiltermodeltest target_link_libraries(sortfiltermodeltest
plasma plasma
KDE4__kde4support ${KDE4Support_LIBRARIES}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
) )

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

@ -11,7 +11,7 @@ target_link_libraries(dirmodelplugin
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${Qt5Qml_LIBRARIES} ${Qt5Qml_LIBRARIES}
${KDE4_KIO_LIBS} ${KDE4_KIO_LIBS}
KDE4__kde4support ${KDE4Support_LIBRARIES}
) )
install(TARGETS dirmodelplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/dirmodel) install(TARGETS dirmodelplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/dirmodel)

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

@ -8,7 +8,7 @@ target_link_libraries(fullmodelaccesstest
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
${KDE4_KDECORE_LIBS} ${KDE4_KDECORE_LIBS}
KDE4__kde4support ${KDE4Support_LIBRARIES}
) )
add_test(plasma-fullmodelaccesstest fullmodelaccesstest) add_test(plasma-fullmodelaccesstest fullmodelaccesstest)

2
src/plasma/CMakeLists.txt
View File

@ -150,7 +150,7 @@ target_link_libraries(plasma
${KWindowSystem_LIBRARIES} ${KWindowSystem_LIBRARIES}
${PLASMA_EXTRA_LIBS} ${PLASMA_EXTRA_LIBS}
ki18n ki18n
${kde4support_LIBRARY} ${KDE4Support_LIBRARIES}
) )
#FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere #FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
target_link_libraries(plasma kdeclarative ${KArchive_LIBRARIES}) target_link_libraries(plasma kdeclarative ${KArchive_LIBRARIES})

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

@ -26,7 +26,7 @@ include_directories(${PHONON_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/common)
kde4_add_plugin(plasma_appletscript_declarative ${declarative_appletscript_SRCS}) kde4_add_plugin(plasma_appletscript_declarative ${declarative_appletscript_SRCS})
target_link_libraries(plasma_appletscript_declarative target_link_libraries(plasma_appletscript_declarative
${KDE4_KIO_LIBS} ${KDE4_KIO_LIBS}
${KDE4_KDE4SUPPORT_LIBS} ${KDE4Support_LIBRARIES}
${QT_QTSCRIPT_LIBRARY} ${QT_QTSCRIPT_LIBRARY}
${Qt5Quick_LIBRARIES} ${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES} ${Qt5Qml_LIBRARIES}

3
src/shell/CMakeLists.txt
View File

@ -82,11 +82,10 @@ target_link_libraries(plasma-shell
plasma plasma
${Qt5Script_LIBRARIES} ${Qt5Script_LIBRARIES}
${KDE4_KDEUI_LIBS} ${KDE4_KDEUI_LIBS}
KDE4__kde4support ${KDE4Support_LIBRARIES}
${Solid_LIBRARIES} ${Solid_LIBRARIES}
kdeclarative kdeclarative
) )
message("+++ kde4support : ${kde4support_LIBRARY}")
install(TARGETS plasma-shell ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS plasma-shell ${INSTALL_TARGETS_DEFAULT_ARGS})