[Cmake-commits] CMake branch, next, updated. v2.8.12-4485-gcfe9076

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  cfe9076a254babd9538fea26b113acbc74b37f93 (commit)
       via  1093deebd0bd561f06419b84133620e9473b17e4 (commit)
      from  e3d76fff757ed809f8a4833c703cebda7d944ab5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfe9076a254babd9538fea26b113acbc74b37f93
commit cfe9076a254babd9538fea26b113acbc74b37f93
Merge: e3d76ff 1093dee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 25 09:08:15 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 25 09:08:15 2013 -0400

    Merge topic 'less-versioned-installs' into next
    
    1093dee Shorten CMake version used in install destinations


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1093deebd0bd561f06419b84133620e9473b17e4
commit 1093deebd0bd561f06419b84133620e9473b17e4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 25 08:55:50 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 25 09:01:37 2013 -0400

    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.

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()
 
diff --git a/bootstrap b/bootstrap
index 2e455d7..2d44d67 100755
--- a/bootstrap
+++ b/bootstrap
@@ -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
+}
 '
 }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeInstallDestinations.cmake |    8 +++++---
 bootstrap                             |    8 +++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake