diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-25 12:55:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-10-25 13:01:37 (GMT) |
| commit | 1093deebd0bd561f06419b84133620e9473b17e4 (patch) | |
| tree | 1742af8c1ef007d9434fe9481e62a701a36ccbf4 | |
| parent | 8c0bbd37df52900678b3a85b146d7a7f65cba374 (diff) | |
| download | CMake-1093deebd0bd561f06419b84133620e9473b17e4.zip CMake-1093deebd0bd561f06419b84133620e9473b17e4.tar.gz CMake-1093deebd0bd561f06419b84133620e9473b17e4.tar.bz2 | |
Shorten CMake version used in install destinations
Since commit c9a5f34b (Cleanup use of CMake version in install
destinations, 2013-09-26) we use the full CMake version in default
install destinations. For rapidly changing versions of the form
<major>.<minor>.<patch>.<date>-g<commit>[-dirty]
used by developers this is too granular. Instead use just
<major>.<minor>.<patch>
as the version for default install destinations. This will still
be granular enough for unique directories in releases.
On Cygwin continue to use the full ${CMake_VERSION} as was the case
prior to the above-mentioned commit.
| -rw-r--r-- | Source/CMakeInstallDestinations.cmake | 8 | ||||
| -rwxr-xr-x | bootstrap | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Source/CMakeInstallDestinations.cmake b/Source/CMakeInstallDestinations.cmake index 33e8ce8..3e93d41 100644 --- a/Source/CMakeInstallDestinations.cmake +++ b/Source/CMakeInstallDestinations.cmake @@ -1,13 +1,15 @@ # Keep formatting here consistent with bootstrap script expectations. -set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION}") # OTHER if(BEOS) + set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") # HAIKU set(CMAKE_MAN_DIR_DEFAULT "documentation/man") # HAIKU - set(CMAKE_DOC_DIR_DEFAULT "documentation/doc/cmake-${CMake_VERSION}") # HAIKU + set(CMAKE_DOC_DIR_DEFAULT "documentation/doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") # HAIKU elseif(CYGWIN) + set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION}") # CYGWIN set(CMAKE_DOC_DIR_DEFAULT "share/doc/cmake-${CMake_VERSION}") # CYGWIN set(CMAKE_MAN_DIR_DEFAULT "share/man") # CYGWIN else() - set(CMAKE_DOC_DIR_DEFAULT "doc/cmake-${CMake_VERSION}") # OTHER + set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") # OTHER + set(CMAKE_DOC_DIR_DEFAULT "doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") # OTHER set(CMAKE_MAN_DIR_DEFAULT "man") # OTHER endif() @@ -28,7 +28,13 @@ cmake_install_dest_default() { cat "${cmake_source_dir}/Source/CMakeInstallDestinations.cmake" | sed -n ' /^ *set(CMAKE_'"${1}"'_DIR_DEFAULT.*) # '"${2}"'$/ { - s/^ *set(CMAKE_'"${1}"'_DIR_DEFAULT *"\([^"]*\)").*$/\1/;p;q;} + s/^ *set(CMAKE_'"${1}"'_DIR_DEFAULT *"\([^"]*\)").*$/\1/ + s/${CMake_VERSION_MAJOR}/'"${cmake_version_major}"'/ + s/${CMake_VERSION_MINOR}/'"${cmake_version_minor}"'/ + s/${CMake_VERSION_PATCH}/'"${cmake_version_patch}"'/ + p + q +} ' } |