mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-03 13:18:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'fix-CMAKE_ROOT-case'

Browse Source 
3287ba02 Make CMAKE_ROOT independent of case of path used to invoke cmake
This commit is contained in:
Brad King
2017-02-20 10:43:00 -05:00
committed by CMake Topic Stage
parent 53a1ec631d 3287ba0254
commit 168420f35c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmSystemTools.cxx
View File

@@ -1978,6 +1978,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
// ???
}
#endif
exe_dir = cmSystemTools::GetActualCaseForPath(exe_dir);
cmSystemToolsCMakeCommand = exe_dir;
cmSystemToolsCMakeCommand += "/cmake";
cmSystemToolsCMakeCommand += cmSystemTools::GetExecutableExtension();
@@ -2015,8 +2016,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
// Install tree has
// - "<prefix><CMAKE_BIN_DIR>/cmake"
// - "<prefix><CMAKE_DATA_DIR>"
const std::string actual_case = cmSystemTools::GetActualCaseForPath(exe_dir);
if (cmHasSuffix(actual_case, CMAKE_BIN_DIR)) {
if (cmHasSuffix(exe_dir, CMAKE_BIN_DIR)) {
std::string const prefix =
exe_dir.substr(0, exe_dir.size() - strlen(CMAKE_BIN_DIR));
cmSystemToolsCMakeRoot = prefix + CMAKE_DATA_DIR;