kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bootstrap: Clarify name of configured source directory

Browse Source 
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.
This commit is contained in:
Brad King 2014-06-25 13:32:48 -04:00
parent 55d6aa36a5
commit bc1517579d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmSystemTools.cxx
View File

@ -2215,7 +2215,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
} }
#else #else
// Bootstrap build knows its source. // Bootstrap build knows its source.
cmSystemToolsCMakeRoot = CMAKE_ROOT_DIR; cmSystemToolsCMakeRoot = CMAKE_BOOTSTRAP_SOURCE_DIR;
#endif #endif
} }

6
bootstrap
View File

@ -1474,9 +1474,9 @@ fi
# When bootstrapping on MinGW with MSYS we must convert the source # When bootstrapping on MinGW with MSYS we must convert the source
# directory to a windows path. # directory to a windows path.
if ${cmake_system_mingw}; then 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 else
cmake_root_dir="${cmake_source_dir}" CMAKE_BOOTSTRAP_SOURCE_DIR="${cmake_source_dir}"
fi fi
# Write CMake version # 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_MINOR ${cmake_version_minor}"
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_PATCH ${cmake_version_patch}" cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_PATCH ${cmake_version_patch}"
cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\"" 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_DATA_DIR \"/bootstrap-not-insalled\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP" cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP"