diff options
| author | Berk Geveci <berk.geveci@kitware.com> | 2001-09-28 16:14:52 (GMT) |
|---|---|---|
| committer | Berk Geveci <berk.geveci@kitware.com> | 2001-09-28 16:14:52 (GMT) |
| commit | 55415f418a807f5995fb1fb9e3af57181af89a2d (patch) | |
| tree | 921ec17154509af40f46b3ff67ae1d8e88b30f0c /Source/cmSystemTools.cxx | |
| parent | 9ae8234fe5c1fd3b46bc4c89b09ed6342c18b43c (diff) | |
| download | CMake-55415f418a807f5995fb1fb9e3af57181af89a2d.zip CMake-55415f418a807f5995fb1fb9e3af57181af89a2d.tar.gz CMake-55415f418a807f5995fb1fb9e3af57181af89a2d.tar.bz2 | |
BUG: separate path from file name before calling realpath
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 565e8fe..fece05c 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1181,9 +1181,9 @@ void cmSystemTools::SplitProgramPath(const char* in_name, */ std::string cmSystemTools::CollapseFullPath(const char* in_name) { -#ifdef _WIN32 std::string dir, file; cmSystemTools::SplitProgramPath(in_name, dir, file); +#ifdef _WIN32 // Ultra-hack warning: // This changes to the target directory, saves the 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]; # endif # endif - realpath(in_name, resolved_name); - return resolved_name; + realpath(dir.c_str(), resolved_name); + return dir + "/" + file; #endif } |