[Cmake-commits] CMake branch, next, updated. v3.3.1-2668-g1bc2c6d

[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  1bc2c6d2dadfbbedb7dee9a2d2f2baa830866d13 (commit)
       via  f4b633a3612d290d6986bbfc56ff2d69807a134b (commit)
      from  70c864ae8ffec43956e751a2ab600862b4fdac7d (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=1bc2c6d2dadfbbedb7dee9a2d2f2baa830866d13
commit 1bc2c6d2dadfbbedb7dee9a2d2f2baa830866d13
Merge: 70c864a f4b633a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 31 16:25:49 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 31 16:25:49 2015 -0400

    Merge topic 'release-scripts-osx-doc-dir' into next
    
    f4b633a3 Utilities/Release: Install docs in unversioned dir on OS X (#15692)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4b633a3612d290d6986bbfc56ff2d69807a134b
commit f4b633a3612d290d6986bbfc56ff2d69807a134b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 31 16:22:46 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 31 16:24:38 2015 -0400

    Utilities/Release: Install docs in unversioned dir on OS X (#15692)
    
    The CMake.app directory will never overlap with another version of CMake
    so we do not need to have a version number on the documentation
    directory.  Configure our release binaries on OS X to place the
    documentation in an unversioned directory under CMake.app so that
    one can always use a path like
    
     /Applications/CMake.app/Contents/doc/cmake/html/index.html
    
    to visit the documentation even after updating CMake.

diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
index 01f5b8b..2802e47 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -9,6 +9,7 @@ set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
 set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_DOC_DIR:PATH=doc/cmake
 CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
 CMAKE_USE_OPENSSL:BOOL=ON
 OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a
diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index be1dfa9..0278f28 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -14,6 +14,7 @@ OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcry
 OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include
 OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a
 CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_DOC_DIR:PATH=doc/cmake
 CMAKE_OSX_ARCHITECTURES:STRING=x86_64
 CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE

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

Summary of changes:
 Utilities/Release/dashmacmini2_release.cmake |    1 +
 Utilities/Release/dashmacmini5_release.cmake |    1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
CMake