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 51e62249592aedb7b5acfbe649004020efb5073d (commit)
via 9025eeb71d2499e18ec53bad7c6766f576074990 (commit)
from 13bfc90b30f10c06eabacd22332a33c348057863 (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=51e62249592aedb7b5acfbe649004020efb5073d
commit 51e62249592aedb7b5acfbe649004020efb5073d
Merge: 13bfc90 9025eeb
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 1 09:27:51 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 1 09:27:51 2015 -0400
Merge topic 'release-scripts-osx-doc-dir' into next
9025eeb7 fixup! Utilities/Release: Install docs in unversioned dir on OS X
(#15692)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9025eeb71d2499e18ec53bad7c6766f576074990
commit 9025eeb71d2499e18ec53bad7c6766f576074990
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 1 09:27:27 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Sep 1 09:27:27 2015 -0400
fixup! Utilities/Release: Install docs in unversioned dir on OS X (#15692)
diff --git a/Utilities/Release/dashmacmini2_release.cmake
b/Utilities/Release/dashmacmini2_release.cmake
index 2802e47..cd4c5a1 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -1,7 +1,7 @@
set(PROCESSORS 2)
set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc <FLAGS>
<CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>
-shared-libgcc -lstdc++-static\\\")")
-set(INSTALL_PREFIX /)
+set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
set(HOST dashmacmini2)
set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j2")
@@ -9,7 +9,6 @@ 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 0278f28..b147013 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -1,7 +1,7 @@
set(PROCESSORS 4)
set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
# set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc <FLAGS>
<CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>
-shared-libgcc -lstdc++-static\\\")")
-set(INSTALL_PREFIX /)
+set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
set(HOST dashmacmini5)
set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j5")
@@ -14,7 +14,6 @@
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
diff --git a/Utilities/Release/release_cmake.sh.in
b/Utilities/Release/release_cmake.sh.in
index 76fdb3a..06e720f 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -116,15 +116,9 @@ if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then
@CMAKE_CONFIGURE_PATH@ ../@CMAKE_CREATE_VERSION@
check_exit_value $? "Configure cmake" || exit 1
else
- if [ -z "@INSTALL_PREFIX@" ]; then
- echo "Run cmake bootstrap --parallel=@PROCESSORS@"
- ../@CMAKE_CREATE_VERSION@/bootstrap --parallel=@PROCESSORS@
- check_exit_value $? "Bootstrap cmake" || exit 1
- else
- echo "Run cmake bootstrap --prefix=@INSTALL_PREFIX@
--parallel=@PROCESSORS@"
- ../@CMAKE_CREATE_VERSION@/bootstrap --prefix=@INSTALL_PREFIX@
--parallel=@PROCESSORS@
- check_exit_value $? "Bootstrap cmake" || exit 1
- fi
+ echo "Run cmake bootstrap @BOOTSTRAP_ARGS@ --parallel=@PROCESSORS@"
+ ../@CMAKE_CREATE_VERSION@/bootstrap @BOOTSTRAP_ARGS@
--parallel=@PROCESSORS@
+ check_exit_value $? "Bootstrap cmake" || exit 1
fi
echo "Build cmake with @MAKE@"
-----------------------------------------------------------------------
Summary of changes:
Utilities/Release/dashmacmini2_release.cmake | 3 +--
Utilities/Release/dashmacmini5_release.cmake | 3 +--
Utilities/Release/release_cmake.sh.in | 12 +++---------
3 files changed, 5 insertions(+), 13 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
