diff --git a/CMakeLists.txt b/CMakeLists.txt index a6c3ea092..076361b72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt index 55519825d..7b7b16f4c 100644 --- a/src/declarativeimports/core/CMakeLists.txt +++ b/src/declarativeimports/core/CMakeLists.txt @@ -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 diff --git a/src/declarativeimports/plasmacomponents/CMakeLists.txt b/src/declarativeimports/plasmacomponents/CMakeLists.txt index 75c179143..ad61ab2c1 100644 --- a/src/declarativeimports/plasmacomponents/CMakeLists.txt +++ b/src/declarativeimports/plasmacomponents/CMakeLists.txt @@ -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) diff --git a/src/declarativeimports/qtextracomponents/CMakeLists.txt b/src/declarativeimports/qtextracomponents/CMakeLists.txt index c924d5961..4a97bb13f 100644 --- a/src/declarativeimports/qtextracomponents/CMakeLists.txt +++ b/src/declarativeimports/qtextracomponents/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(qtextracomponentsplugin ${Qt5Quick_LIBRARIES} ${Qt5Qml_LIBRARIES} ${QT_QTGUI_LIBRARY} - ${KDECLARATIVE_LIBRARIES} + ${KDeclarative_LIBRARIES} KF5::KIconThemes plasma) diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index e879b71c2..c162cc606 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -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}) diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt index 3540e8d94..5b89dd66c 100644 --- a/src/plasmaquick/CMakeLists.txt +++ b/src/plasmaquick/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(PlasmaQuick ${KCoreAddons_LIBRARIES} ${XmlGui_LIBRARIES} plasma - kdeclarative + KDeclarative ) set_target_properties(PlasmaQuick PROPERTIES diff --git a/src/scriptengines/qml/CMakeLists.txt b/src/scriptengines/qml/CMakeLists.txt index 7f00b99e6..757df769f 100644 --- a/src/scriptengines/qml/CMakeLists.txt +++ b/src/scriptengines/qml/CMakeLists.txt @@ -38,7 +38,7 @@ target_link_libraries(plasma_appletscript_declarative ${KCore_LIBRARIES} KF5::KI18n plasma - kdeclarative + KDeclarative ) diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt index 7c610f4ed..37ce09584 100644 --- a/src/shell/CMakeLists.txt +++ b/src/shell/CMakeLists.txt @@ -85,7 +85,7 @@ target_link_libraries(plasma-shell ${Qt5Script_LIBRARIES} ${KDE4Support_LIBRARIES} ${Solid_LIBRARIES} - kdeclarative + KDeclarative KF5::KI18n KF5::XmlGui )