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

BUG: separate path from file name before calling realpath

Browse Source
This commit is contained in:
Berk Geveci 2001-09-28 12:14:52 -04:00
parent 9ae8234fe5
commit 55415f418a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmSystemTools.cxx
View File

@ -1181,9 +1181,9 @@ void cmSystemTools::SplitProgramPath(const char* in_name,
*/ */
std::string cmSystemTools::CollapseFullPath(const char* in_name) std::string cmSystemTools::CollapseFullPath(const char* in_name)
{ {
#ifdef _WIN32
std::string dir, file; std::string dir, file;
cmSystemTools::SplitProgramPath(in_name, dir, file); cmSystemTools::SplitProgramPath(in_name, dir, file);
#ifdef _WIN32
// Ultra-hack warning: // Ultra-hack warning:
// This changes to the target directory, saves the working directory, // This changes to the target directory, saves the working directory,
// and then changes back to the original working directory. // and then changes back to the original working directory.
@ -1205,8 +1205,8 @@ std::string cmSystemTools::CollapseFullPath(const char* in_name)
char resolved_name[5024]; char resolved_name[5024];
# endif # endif
# endif # endif
realpath(in_name, resolved_name); realpath(dir.c_str(), resolved_name);
return resolved_name; return dir + "/" + file;
#endif #endif
} }