[Cmake-commits] [cmake-commits] hoffman committed cmSystemTools.cxx 1.368 1.369 cmake.cxx 1.379 1.380

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv12453

Modified Files:
	cmSystemTools.cxx cmake.cxx 
Log Message:
ENH: try to fix mac symlinks to the executable


Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.368
retrieving revision 1.369
diff -C 2 -d -r1.368 -r1.369
*** cmSystemTools.cxx	2 Mar 2008 21:19:26 -0000	1.368
--- cmSystemTools.cxx	28 Mar 2008 18:29:28 -0000	1.369
***************
*** 2108,2111 ****
--- 2108,2113 ----
    if(cmSystemTools::FindProgramPath(argv0, exe, errorMsg))
      {
+     // remove symlinks
+     exe = cmSystemTools::GetRealPath(exe.c_str());
      cmSystemToolsExecutableDirectory =
        cmSystemTools::GetFilenamePath(exe.c_str());

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.379
retrieving revision 1.380
diff -C 2 -d -r1.379 -r1.380
*** cmake.cxx	27 Mar 2008 21:05:11 -0000	1.379
--- cmake.cxx	28 Mar 2008 18:29:29 -0000	1.380
***************
*** 859,864 ****
      {
      // next try exe/..
!     cMakeRoot  = cmSystemTools::GetProgramPath(cMakeSelf.c_str());
!     cMakeRoot = cmSystemTools::GetRealPath(cMakeRoot.c_str());
      std::string::size_type slashPos = cMakeRoot.rfind("/");
      if(slashPos != std::string::npos)
--- 859,864 ----
      {
      // next try exe/..
!     cMakeRoot = cmSystemTools::GetRealPath(cMakeSelf.c_str());
!     cMakeRoot = cmSystemTools::GetProgramPath(cMakeRoot.c_str());
      std::string::size_type slashPos = cMakeRoot.rfind("/");
      if(slashPos != std::string::npos)