Merge topic 'bootstrap-verbose-makefiles-issue-11708'
144a82c
bootstrap: --verbose implies verbose Makefiles (#11708)
This commit is contained in:
commit
cbd40b3b7c
|
@ -1519,7 +1519,11 @@ export CXX
|
||||||
export MAKE
|
export MAKE
|
||||||
|
|
||||||
# Run bootstrap CMake to configure real CMake
|
# 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=$?
|
RES=$?
|
||||||
if [ "${RES}" -ne "0" ]; then
|
if [ "${RES}" -ne "0" ]; then
|
||||||
cmake_error 11 "Problem while running initial CMake"
|
cmake_error 11 "Problem while running initial CMake"
|
||||||
|
|
Loading…
Reference in New Issue