diff options
| author | Daniele E. Domenichelli <ddomenichelli@kde.org> | 2013-09-26 11:50:55 +0200 |
|---|---|---|
| committer | Daniele E. Domenichelli <ddomenichelli@kde.org> | 2013-09-26 11:50:55 +0200 |
| commit | f3b5aa4ea549f912c57a5c9aeb61f489730984e6 (patch) | |
| tree | a65a402a39d6d192d9fbf678d4b3117387ebe45d | |
| parent | 9b2d1b1e090e8130c332a29329fd7d6df0a02deb (diff) | |
| download | extra-cmake-modules-f3b5aa4ea549f912c57a5c9aeb61f489730984e6.tar.gz extra-cmake-modules-f3b5aa4ea549f912c57a5c9aeb61f489730984e6.tar.bz2 | |
Revert "make extra-cmake-modules architecture-independent"
This reverts commit 53679542f663dc74276b928e8749b082319826f4.
Since no language has been enabled, the file generated by
write_basic_package_version_file does not care about the
architecture
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ECMConfigVersion.cmake.in | 19 |
2 files changed, 3 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 49e90b03..ccd6ea22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,9 @@ configure_package_config_file(ECMConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/ECM PATH_VARS FIND_MODULES_INSTALL_DIR KDE_MODULES_INSTALL_DIR MODULES_INSTALL_DIR ) -configure_file(ECMConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/ECMConfigVersion.cmake @ONLY ) +write_basic_package_version_file( ${CMAKE_CURRENT_BINARY_DIR}/ECMConfigVersion.cmake + VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION} + COMPATIBILITY AnyNewerVersion ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ECMConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/ECMConfigVersion.cmake diff --git a/ECMConfigVersion.cmake.in b/ECMConfigVersion.cmake.in deleted file mode 100644 index 2bbb8f90..00000000 --- a/ECMConfigVersion.cmake.in +++ /dev/null @@ -1,19 +0,0 @@ -# This is a basic version file for the Config-mode of find_package(). -# It is used by write_basic_package_version_file() as input file for configure_file() -# to create a version-file which can be installed along a config.cmake file. -# -# The created file sets PACKAGE_VERSION_EXACT if the current version string and -# the requested version string are exactly the same and it sets -# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version. -# The variable CVF_VERSION must be set before calling configure_file(). - -set(PACKAGE_VERSION "@ECM_VERSION@") - -if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) - set(PACKAGE_VERSION_COMPATIBLE FALSE) -else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") - set(PACKAGE_VERSION_EXACT TRUE) - endif() -endif() |