summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-01-19 19:01:52 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-01-19 19:01:52 (GMT)
commitcbd40b3b7cd569c87ebcdac03ec0931a6f47771d (patch)
tree117818ab2b47a6c03f65f19d31dc67643d40fc82
parent1837276eb3111f34029c6107d0e8b4b667602813 (diff)
parent144a82ca7eeb27cc105b683d932c8b2ee7415e71 (diff)
downloadCMake-cbd40b3b7cd569c87ebcdac03ec0931a6f47771d.zip
CMake-cbd40b3b7cd569c87ebcdac03ec0931a6f47771d.tar.gz
CMake-cbd40b3b7cd569c87ebcdac03ec0931a6f47771d.tar.bz2
Merge topic 'bootstrap-verbose-makefiles-issue-11708'
144a82c bootstrap: --verbose implies verbose Makefiles (#11708)
-rwxr-xr-xbootstrap6
1 files changed, 5 insertions, 1 deletions
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"