summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-26 14:29:20 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-26 14:29:20 (GMT)
commit40df0d653659fe3403bbeb5e3251f8cea72926fd (patch)
tree18aab05eead778081dfcd1f23036da761ea4c0f6 /Source
parentfc15fe75c5500a1a9f1e9756ee995a9de92549f2 (diff)
parent1093deebd0bd561f06419b84133620e9473b17e4 (diff)
downloadCMake-40df0d653659fe3403bbeb5e3251f8cea72926fd.zip
CMake-40df0d653659fe3403bbeb5e3251f8cea72926fd.tar.gz
CMake-40df0d653659fe3403bbeb5e3251f8cea72926fd.tar.bz2
Merge topic 'less-versioned-installs'
1093dee Shorten CMake version used in install destinations
Diffstat (limited to 'Source')
-rw-r--r--Source/CMakeInstallDestinations.cmake8
1 files changed, 5 insertions, 3 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()