summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-30 20:19:53 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-30 20:22:09 (GMT)
commit4901ab6fd295dfa379d4adf24de7c1efd86a139a (patch)
tree03e970d384e66f3f633b965219efaab14b1c29b7
parent01d583e719c247a43b71624c3f658d2656f949a6 (diff)
Set min versions for ECM & KF5
-rw-r--r--CMakeLists.txt2
-rw-r--r--data/CMakeLists.txt2
-rw-r--r--doc/CMakeLists.txt4
-rw-r--r--src/apps/marble-kde/CMakeLists.txt4
-rw-r--r--src/bindings/CMakeLists.txt4
-rw-r--r--src/plasma/CMakeLists.txt4
-rw-r--r--src/plasmarunner/CMakeLists.txt4
-rw-r--r--src/plugins/runner/gpx/CMakeLists.txt4
-rw-r--r--src/plugins/runner/json/CMakeLists.txt4
-rw-r--r--src/plugins/runner/kml/CMakeLists.txt4
-rw-r--r--src/plugins/runner/osm/CMakeLists.txt4
-rw-r--r--src/plugins/runner/shp/CMakeLists.txt4
-rw-r--r--src/thumbnailer/CMakeLists.txt4
13 files changed, 25 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e498a1c..5bec679 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -274,8 +274,10 @@ endif(WIN32)
####################################################
# Add global ECM & KF5 settings
+set(REQUIRED_ECM_VERSION 1.7.0)
set(KDE_INSTALL_DIRS_NO_DEPRECATED TRUE)
set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled")
+set(REQUIRED_KF5_VERSION 5.7.0)
####################################################
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 13989f4..705770e 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -273,7 +273,7 @@ DESTINATION ${MARBLE_DATA_INSTALL_PATH}/audio)
add_subdirectory(lang)
-find_package(ECM QUIET) # for FindSharedMimeInfo
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET) # for FindSharedMimeInfo
if(NOT ECM_FOUND)
return()
endif()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 7cfd10a..a8dc4c3 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,7 +1,7 @@
########### install files ###############
#
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -9,7 +9,7 @@ endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
-macro_optional_find_package(KF5 QUIET COMPONENTS DocTools)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS DocTools)
if(KF5_FOUND)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR marble)
diff --git a/src/apps/marble-kde/CMakeLists.txt b/src/apps/marble-kde/CMakeLists.txt
index 75e58e6..3fe5187 100644
--- a/src/apps/marble-kde/CMakeLists.txt
+++ b/src/apps/marble-kde/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -11,7 +11,7 @@ set(LIB_INSTALL_DIR ${KDE_INSTALL_LIBDIR})
include(KDECMakeSettings)
include(ECMInstallIcons)
-macro_optional_find_package(KF5 QUIET COMPONENTS Crash NewStuff Parts CoreAddons I18n)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS Crash NewStuff Parts CoreAddons I18n)
if(NOT KF5_FOUND)
return()
diff --git a/src/bindings/CMakeLists.txt b/src/bindings/CMakeLists.txt
index 99708ea..3e189a7 100644
--- a/src/bindings/CMakeLists.txt
+++ b/src/bindings/CMakeLists.txt
@@ -3,7 +3,7 @@ if(EXPERIMENTAL_PYTHON_BINDINGS)
return()
endif()
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
-macro_optional_find_package(KF5 QUIET COMPONENTS Wallet NewStuff Parts)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS Wallet NewStuff Parts)
if(NOT KF5_FOUND)
return()
diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt
index a29db56..913a7ed 100644
--- a/src/plasma/CMakeLists.txt
+++ b/src/plasma/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -13,7 +13,7 @@ set(SERVICES_INSTALL_DIR ${KDE_INSTALL_KSERVICES5DIR})
set(DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR})
include(KDECMakeSettings)
-macro_optional_find_package(KF5 QUIET COMPONENTS Plasma)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS Plasma)
if (NOT KF5_FOUND)
return()
diff --git a/src/plasmarunner/CMakeLists.txt b/src/plasmarunner/CMakeLists.txt
index 23c19c4..9cfaec1 100644
--- a/src/plasmarunner/CMakeLists.txt
+++ b/src/plasmarunner/CMakeLists.txt
@@ -1,6 +1,6 @@
project(MarblePlasmaRunner)
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -13,7 +13,7 @@ include(KDEInstallDirs)
set(LIB_INSTALL_DIR ${KDE_INSTALL_LIBDIR})
include(KDECMakeSettings)
-macro_optional_find_package(KF5 QUIET COMPONENTS Runner I18n)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS Runner I18n)
if(NOT KF5_FOUND)
return()
diff --git a/src/plugins/runner/gpx/CMakeLists.txt b/src/plugins/runner/gpx/CMakeLists.txt
index 737019e..62e1e10 100644
--- a/src/plugins/runner/gpx/CMakeLists.txt
+++ b/src/plugins/runner/gpx/CMakeLists.txt
@@ -48,7 +48,7 @@ if( BUILD_MARBLE_TESTS )
endif( BUILD_MARBLE_TESTS )
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -57,7 +57,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
-macro_optional_find_package(KF5 QUIET COMPONENTS KIO)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS KIO)
if(NOT KF5_FOUND)
return()
endif()
diff --git a/src/plugins/runner/json/CMakeLists.txt b/src/plugins/runner/json/CMakeLists.txt
index 85be01e..e034784 100644
--- a/src/plugins/runner/json/CMakeLists.txt
+++ b/src/plugins/runner/json/CMakeLists.txt
@@ -11,7 +11,7 @@ set( JsonPlugin_LIBS Qt5::Script )
marble_add_plugin( JsonPlugin ${json_SRCS} )
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -20,7 +20,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
-macro_optional_find_package(KF5 QUIET COMPONENTS KIO)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS KIO)
if(NOT KF5_FOUND)
return()
endif()
diff --git a/src/plugins/runner/kml/CMakeLists.txt b/src/plugins/runner/kml/CMakeLists.txt
index b35b6a5..a31ce98 100644
--- a/src/plugins/runner/kml/CMakeLists.txt
+++ b/src/plugins/runner/kml/CMakeLists.txt
@@ -11,7 +11,7 @@ set( kml_SRCS KmlDocument.cpp KmlParser.cpp KmlPlugin.cpp KmlRunner.cpp KmzHandl
marble_add_plugin( KmlPlugin ${kml_SRCS} )
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -20,7 +20,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
-macro_optional_find_package(KF5 QUIET COMPONENTS KIO)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS KIO)
if(NOT KF5_FOUND)
return()
endif()
diff --git a/src/plugins/runner/osm/CMakeLists.txt b/src/plugins/runner/osm/CMakeLists.txt
index 9abfee9..99828a0 100644
--- a/src/plugins/runner/osm/CMakeLists.txt
+++ b/src/plugins/runner/osm/CMakeLists.txt
@@ -35,7 +35,7 @@ set( osm_SRCS
marble_add_plugin( OsmPlugin ${osm_SRCS} ${osm_writers_SRCS} ${osm_translators_SRCS} )
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -44,7 +44,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
-macro_optional_find_package(KF5 QUIET COMPONENTS KIO)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS KIO)
if(NOT KF5_FOUND)
return()
endif()
diff --git a/src/plugins/runner/shp/CMakeLists.txt b/src/plugins/runner/shp/CMakeLists.txt
index 50e29db..7e08089 100644
--- a/src/plugins/runner/shp/CMakeLists.txt
+++ b/src/plugins/runner/shp/CMakeLists.txt
@@ -13,7 +13,7 @@ set( ShpPlugin_LIBS ${LIBSHP_LIBRARIES} )
marble_add_plugin( ShpPlugin ${shp_SRCS} )
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -22,7 +22,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
-macro_optional_find_package(KF5 QUIET COMPONENTS KIO)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS KIO)
if(NOT KF5_FOUND)
return()
endif()
diff --git a/src/thumbnailer/CMakeLists.txt b/src/thumbnailer/CMakeLists.txt
index e28057a..9d7da49 100644
--- a/src/thumbnailer/CMakeLists.txt
+++ b/src/thumbnailer/CMakeLists.txt
@@ -1,6 +1,6 @@
project(MarbleThumbnailer)
-find_package(ECM QUIET)
+find_package(ECM ${REQUIRED_ECM_VERSION} QUIET)
if(NOT ECM_FOUND)
return()
endif()
@@ -8,7 +8,7 @@ endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDEInstallDirs)
-macro_optional_find_package(KF5 QUIET COMPONENTS KIO)
+macro_optional_find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET COMPONENTS KIO)
if (NOT KF5_FOUND)
return()