diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-20 16:53:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-01-20 16:53:24 (GMT) |
| commit | 2b1cdd85b8943059e5f2b27735df261743749342 (patch) | |
| tree | 952fdfe647b7df7774b3b9173c5d62af74947df2 | |
| parent | 35413bf2c1b33980afd418030af27f184872af6b (diff) | |
| parent | 7f0a21a51eb483c523a2c8880ce4e0466251ec74 (diff) | |
| download | CMake-2b1cdd85b8943059e5f2b27735df261743749342.zip CMake-2b1cdd85b8943059e5f2b27735df261743749342.tar.gz CMake-2b1cdd85b8943059e5f2b27735df261743749342.tar.bz2 | |
Merge branch 'case-insensitive-bindir-detection' into release
| -rw-r--r-- | Source/cmSystemTools.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 3d8fdf5..e693beb 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1979,7 +1979,8 @@ void cmSystemTools::FindCMakeResources(const char* argv0) // Install tree has // - "<prefix><CMAKE_BIN_DIR>/cmake" // - "<prefix><CMAKE_DATA_DIR>" - if (cmHasSuffix(exe_dir, CMAKE_BIN_DIR)) { + const std::string actual_case = cmSystemTools::GetActualCaseForPath(exe_dir); + if (cmHasSuffix(actual_case, CMAKE_BIN_DIR)) { std::string const prefix = exe_dir.substr(0, exe_dir.size() - strlen(CMAKE_BIN_DIR)); cmSystemToolsCMakeRoot = prefix + CMAKE_DATA_DIR; |