summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-09 11:35:42 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-09 11:35:42 (GMT)
commit7ed790f7c59cf51f3ee8387a6f98de31c30e4bcb (patch)
tree2597245ea4d0557b3b17981bb2538583ca5d3f6e
parent494da6a6c8a40aeda47c88c888e2f1b1b6e90e2f (diff)
Revert "Note KF5 version where SERVICES_INSTALL_DIR, DATA_INSTALL_DIR are needed"
Missed to push another needed patch to KPackage to make this work, so will be only a later KF5 version where this is fixed hopefully. This reverts commit fb427298b1d31734b86ebdca4e6be04d7ff570d1.
-rw-r--r--src/plasma/CMakeLists.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt
index 707e933..913a7ed 100644
--- a/src/plasma/CMakeLists.txt
+++ b/src/plasma/CMakeLists.txt
@@ -8,6 +8,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
# KDECMakeSettings expexts LIB_INSTALL_DIR set
set(LIB_INSTALL_DIR ${KDE_INSTALL_LIBDIR})
+# Plasma macros assume SERVICES_INSTALL_DIR, DATA_INSTALL_DIR
+set(SERVICES_INSTALL_DIR ${KDE_INSTALL_KSERVICES5DIR})
+set(DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR})
include(KDECMakeSettings)
macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS Plasma)
@@ -15,11 +18,6 @@ macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS Plasma)
if (NOT KF5_FOUND)
return()
endif()
-if(${KF5_VERSION} VERSION_LESS "5.26.0")
- # Plasma frameworks macros < 5.26 use old SERVICES_INSTALL_DIR, DATA_INSTALL_DIR
- set(SERVICES_INSTALL_DIR ${KDE_INSTALL_KSERVICES5DIR})
- set(DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR})
-endif()
add_subdirectory(qmlplugin)