[Cmake-commits] [cmake-commits] hoffman committed cmake.cxx 1.378 1.379

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Mar 27 17:05:13 EDT 2008


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

Modified Files:
	cmake.cxx 
Log Message:
BUG: fix install problem on make and allow symlinks to cmake bin directory


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.378
retrieving revision 1.379
diff -C 2 -d -r1.378 -r1.379
*** cmake.cxx	27 Mar 2008 02:34:27 -0000	1.378
--- cmake.cxx	27 Mar 2008 21:05:11 -0000	1.379
***************
*** 784,787 ****
--- 784,788 ----
    // Find the cmake executable
    std::string cMakeSelf = cmSystemTools::GetExecutableDirectory();
+   cMakeSelf = cmSystemTools::GetRealPath(cMakeSelf.c_str());
    cMakeSelf += "/cmake";
    cMakeSelf += cmSystemTools::GetExecutableExtension();
***************
*** 859,862 ****
--- 860,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)



More information about the Cmake-commits mailing list