From f0937a4fe5db2ab7f566110876d2984779f33a3e Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 28 Aug 2011 21:59:42 +0200 Subject: Remove module which is replaced by a cmake 2.8.6 feature. --- modules/ECMConfigVersion.cmake.in | 11 ----------- modules/ECMQtFramework.cmake | 9 +++++---- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 modules/ECMConfigVersion.cmake.in diff --git a/modules/ECMConfigVersion.cmake.in b/modules/ECMConfigVersion.cmake.in deleted file mode 100644 index aeed4dc0..00000000 --- a/modules/ECMConfigVersion.cmake.in +++ /dev/null @@ -1,11 +0,0 @@ - -set(PACKAGE_VERSION @ECM_VERSION_MAJOR@.@ECM_VERSION_MINOR@.@ECM_VERSION_PATCH@) - -if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_COMPATIBLE FALSE) -else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if("${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") - set(PACKAGE_VERSION_EXACT TRUE) - endif("${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") -endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") diff --git a/modules/ECMQtFramework.cmake b/modules/ECMQtFramework.cmake index 2763261a..8a5c4575 100644 --- a/modules/ECMQtFramework.cmake +++ b/modules/ECMQtFramework.cmake @@ -86,10 +86,11 @@ configure_file( @ONLY ) -configure_file( - "${EXTRA_CMAKE_MODULES_MODULE_PATH}/ECMConfigVersion.cmake.in" - "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" - @ONLY +include (WriteBasicConfigVersionFile) + +write_basic_config_version_file("${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" + VERSION ${ECM_VERSION_MAJOR}.${ECM_VERSION_MINOR}.${ECM_VERSION_PATCH} + COMPATIBILITY AnyNewerVersion ) configure_file( -- cgit v1.2.1