[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-244-g0b303f9

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0b303f9d018b06a0d46937d6ddc3001484e1c1b8 (commit)
       via  3287ba02540ae94d6b0105f84e930aa19cf61b19 (commit)
      from  38c92f8d1c4e372aaeb598f54822dc71281a580a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b303f9d018b06a0d46937d6ddc3001484e1c1b8
commit 0b303f9d018b06a0d46937d6ddc3001484e1c1b8
Merge: 38c92f8 3287ba0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 17 14:33:51 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 17 14:33:51 2017 -0500

    Merge topic 'fix-CMAKE_ROOT-case' into next
    
    3287ba02 Make CMAKE_ROOT independent of case of path used to invoke cmake


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3287ba02540ae94d6b0105f84e930aa19cf61b19
commit 3287ba02540ae94d6b0105f84e930aa19cf61b19
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 17 10:59:47 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 17 11:09:12 2017 -0500

    Make CMAKE_ROOT independent of case of path used to invoke cmake
    
    We compute the location of `CMAKE_ROOT` and other resources relative to
    the location of our own executable.  On some platforms this path is
    computed in a way that depends on the case of the path used to invoke
    the executable.  Convert the result to the actual case preserved by the
    filesystem on disk in order to make it consistent regardless of how the
    executable is launched.
    
    This approach generalizes the fix made by commit v3.8.0-rc1~71^2
    (cmSystemTools: use the actual case for root detection, 2017-01-18).
    
    Issue: #16648

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 9efc13b..b3a7248 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -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;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmSystemTools.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake