kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: try to fix mac symlinks to the executable

Browse Source
This commit is contained in:
Bill Hoffman 2008-03-28 14:29:29 -04:00
parent e40fe909a6
commit cae34d2df3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmSystemTools.cxx
View File

@ -2107,6 +2107,8 @@ void cmSystemTools::FindExecutableDirectory(const char* argv0)
std::string exe; std::string exe;
if(cmSystemTools::FindProgramPath(argv0, exe, errorMsg)) if(cmSystemTools::FindProgramPath(argv0, exe, errorMsg))
{ {
// remove symlinks
exe = cmSystemTools::GetRealPath(exe.c_str());
cmSystemToolsExecutableDirectory = cmSystemToolsExecutableDirectory =
cmSystemTools::GetFilenamePath(exe.c_str()); cmSystemTools::GetFilenamePath(exe.c_str());
} }

4
Source/cmake.cxx
View File

@ -858,8 +858,8 @@ int cmake::AddCMakePaths()
if(!cmSystemTools::FileExists(modules.c_str())) if(!cmSystemTools::FileExists(modules.c_str()))
{ {
// next try exe/.. // next try exe/..
cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str()); cMakeRoot = cmSystemTools::GetRealPath(cMakeSelf.c_str());
cMakeRoot = cmSystemTools::GetRealPath(cMakeRoot.c_str()); cMakeRoot = cmSystemTools::GetProgramPath(cMakeRoot.c_str());
std::string::size_type slashPos = cMakeRoot.rfind("/"); std::string::size_type slashPos = cMakeRoot.rfind("/");
if(slashPos != std::string::npos) if(slashPos != std::string::npos)
{ {