[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/plasma: Note KF5 version where SERVICES_INSTALL_DIR, DATA_INSTALL_DIR are needed
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2016-09-08 14:37:12
Message-ID: E1bi0S0-00078M-Sk () code ! kde ! org
[Download RAW message or body]

Git commit fb427298b1d31734b86ebdca4e6be04d7ff570d1 by Friedrich W. H. Koss=
ebau.
Committed on 08/09/2016 at 14:35.
Pushed by kossebau into branch 'master'.

Note KF5 version where SERVICES_INSTALL_DIR, DATA_INSTALL_DIR are needed

M  +5    -3    src/plasma/CMakeLists.txt

http://commits.kde.org/marble/fb427298b1d31734b86ebdca4e6be04d7ff570d1

diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt
index 913a7ed..707e933 100644
--- a/src/plasma/CMakeLists.txt
+++ b/src/plasma/CMakeLists.txt
@@ -8,9 +8,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PAT=
H})
 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 P=
lasma)
@@ -18,6 +15,11 @@ 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_I=
NSTALL_DIR
+    set(SERVICES_INSTALL_DIR ${KDE_INSTALL_KSERVICES5DIR})
+    set(DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR})
+endif()
 =

 =

 add_subdirectory(qmlplugin)
[prev in list] [next in list] [prev in thread] [next in thread]