Adapt to kdelibs ab56e2f.

This commit is contained in:
Aleix Pol 2013-10-04 18:40:47 +02:00 committed by Eike Hein
parent f49bef8df4
commit 1891066fc2
8 changed files with 11 additions and 11 deletions

View File

@ -57,7 +57,7 @@ find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
# those are not "done" yet:
find_package(KIO REQUIRED NO_MODULE)
find_package(kdeclarative REQUIRED NO_MODULE)
find_package(KDeclarative REQUIRED NO_MODULE)
# Needed for some includes from KDE/ (KMimeType, etc.)
# FIXME: remove when kdeui is fully split up

View File

@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
${KDE4_INCLUDE_DIR}
${KDECLARATIVE_INCLUDE_DIR}
${KDeclarative_INCLUDE_DIR}
)
add_definitions(-DHAVE_X11=${HAVE_X11})
@ -42,7 +42,7 @@ target_link_libraries(corebindingsplugin
${QT_QTSCRIPT_LIBRARY}
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
${KDECLARATIVE_LIBRARIES}
${KDeclarative_LIBRARIES}
${KCore_LIBRARIES}
${KDE4Support_LIBRARIES}
KF5::KIconThemes

View File

@ -1,6 +1,6 @@
project(plasmacomponents)
#find_package(kdeclarative REQUIRED NO_MODULE)
#find_package(KDeclarative REQUIRED NO_MODULE)
set(plasmacomponents_SRCS
#fullscreensheet.cpp
@ -18,7 +18,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
${KDECLARATIVE_INCLUDE_DIR}
${KDeclarative_INCLUDE_DIR}
)
add_library(plasmacomponentsplugin SHARED ${plasmacomponents_SRCS})
@ -27,7 +27,7 @@ target_link_libraries(plasmacomponentsplugin
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
${QT_QTGUI_LIBRARY}
${KDECLARATIVE_LIBRARIES}
${KDeclarative_LIBRARIES}
plasma)

View File

@ -24,7 +24,7 @@ target_link_libraries(qtextracomponentsplugin
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
${QT_QTGUI_LIBRARY}
${KDECLARATIVE_LIBRARIES}
${KDeclarative_LIBRARIES}
KF5::KIconThemes
plasma)

View File

@ -155,7 +155,7 @@ target_link_libraries(plasma
${KDE4Support_LIBRARIES} # needed for KStandardDirs and KGlobal
)
#FIXME gpgme++ is in kdepimlibs, needs to be elsewhere
target_link_libraries(plasma kdeclarative ${KArchive_LIBRARIES})
target_link_libraries(plasma KDeclarative ${KArchive_LIBRARIES})
if(X11_FOUND)
target_link_libraries(plasma Qt5::X11Extras ${X11_LIBRARIES})

View File

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

View File

@ -38,7 +38,7 @@ target_link_libraries(plasma_appletscript_declarative
${KCore_LIBRARIES}
KF5::KI18n
plasma
kdeclarative
KDeclarative
)

View File

@ -85,7 +85,7 @@ target_link_libraries(plasma-shell
${Qt5Script_LIBRARIES}
${KDE4Support_LIBRARIES}
${Solid_LIBRARIES}
kdeclarative
KDeclarative
KF5::KI18n
KF5::XmlGui
)