Commit 4901ab6f authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Set min versions for ECM & KF5

parent 01d583e7
......@@ -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)
####################################################
......
......@@ -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()
......
########### 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)
......
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()
......
......@@ -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()
......
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()
......
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()
......
......@@ -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()
......
......@@ -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()
......
......@@ -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()
......
......@@ -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()
......
......@@ -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()
......
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()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment