[Cmake-commits] CMake branch, next, updated. v2.8.3-1375-gf128d51
Brad King
brad.king at kitware.com
Mon Jan 17 08:53:44 EST 2011
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 f128d510a87bc70adc24c18a3861a93c185ab07a (commit)
via 144a82ca7eeb27cc105b683d932c8b2ee7415e71 (commit)
from f69b58e536f9624ecddd5fb69c6f1eb3c7b5dff3 (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=f128d510a87bc70adc24c18a3861a93c185ab07a
commit f128d510a87bc70adc24c18a3861a93c185ab07a
Merge: f69b58e 144a82c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 08:53:39 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 17 08:53:39 2011 -0500
Merge topic 'bootstrap-verbose-makefiles-issue-11708' into next
144a82c bootstrap: --verbose implies verbose Makefiles (#11708)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=144a82ca7eeb27cc105b683d932c8b2ee7415e71
commit 144a82ca7eeb27cc105b683d932c8b2ee7415e71
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 08:44:04 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 17 08:44:04 2011 -0500
bootstrap: --verbose implies verbose Makefiles (#11708)
Suggested-by: Nicolas Despres <nicolas.despres at gmail.com>
diff --git a/bootstrap b/bootstrap
index d665bf3..b7d1583 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1519,7 +1519,11 @@ export CXX
export MAKE
# Run bootstrap CMake to configure real CMake
-"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" -DCMAKE_BOOTSTRAP=1 ${cmake_bootstrap_system_libs}
+cmake_options="-DCMAKE_BOOTSTRAP=1"
+if [ -n "${cmake_verbose}" ]; then
+ cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1"
+fi
+"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_options} ${cmake_bootstrap_system_libs}
RES=$?
if [ "${RES}" -ne "0" ]; then
cmake_error 11 "Problem while running initial CMake"
-----------------------------------------------------------------------
Summary of changes:
bootstrap | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list