summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-06-25 17:32:48 (GMT)
committerBrad King <brad.king@kitware.com>2014-06-25 17:37:46 (GMT)
commitbc1517579d897678ad734e82201be42d4e2a7cba (patch)
treed96d9bd8258296496df6ce48d269672ceb8a35a9 /bootstrap
parent55d6aa36a522f2dd7849ccd53d9e743a88f8c7a1 (diff)
downloadCMake-bc1517579d897678ad734e82201be42d4e2a7cba.zip
CMake-bc1517579d897678ad734e82201be42d4e2a7cba.tar.gz
CMake-bc1517579d897678ad734e82201be42d4e2a7cba.tar.bz2
bootstrap: Clarify name of configured source directory
Rename CMAKE_ROOT_DIR to CMAKE_BOOTSTRAP_SOURCE_DIR to clarify both that it is only for bootstrap and that it refers to the source directory.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap b/bootstrap
index 45f67cf..6a25a3f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1474,9 +1474,9 @@ fi
# When bootstrapping on MinGW with MSYS we must convert the source
# directory to a windows path.
if ${cmake_system_mingw}; then
- cmake_root_dir=`cd "${cmake_source_dir}"; pwd -W`
+ CMAKE_BOOTSTRAP_SOURCE_DIR=`cd "${cmake_source_dir}"; pwd -W`
else
- cmake_root_dir="${cmake_source_dir}"
+ CMAKE_BOOTSTRAP_SOURCE_DIR="${cmake_source_dir}"
fi
# Write CMake version
@@ -1484,7 +1484,7 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_MAJOR ${cmake_versi
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_MINOR ${cmake_version_minor}"
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_PATCH ${cmake_version_patch}"
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\""
-cmake_report cmConfigure.h${_tmp} "#define CMAKE_ROOT_DIR \"${cmake_root_dir}\""
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-insalled\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP"