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

Fix for include optional

This commit is contained in:
Bill Hoffman 2003-02-08 10:24:03 -05:00
parent 217f4b764a
commit badbd8dc8d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmSystemTools.cxx
View File

@ -1734,7 +1734,8 @@ std::string cmSystemTools::GetProgramPath(const char* in_name)
*/ */
void cmSystemTools::SplitProgramPath(const char* in_name, void cmSystemTools::SplitProgramPath(const char* in_name,
std::string& dir, std::string& dir,
std::string& file) std::string& file,
bool errorReport)
{ {
dir = in_name; dir = in_name;
file = ""; file = "";
@ -1758,9 +1759,13 @@ void cmSystemTools::SplitProgramPath(const char* in_name,
{ {
std::string oldDir = in_name; std::string oldDir = in_name;
cmSystemTools::ConvertToUnixSlashes(oldDir); cmSystemTools::ConvertToUnixSlashes(oldDir);
cmSystemTools::Error("Error splitting file name off end of path:\n", if(errorReport)
oldDir.c_str(), "\nDirectory not found: ", {
dir.c_str()); cmSystemTools::Error("Error splitting file name off end of path:\n",
oldDir.c_str(), "\nDirectory not found: ",
dir.c_str());
}
dir = in_name; dir = in_name;
return; return;
} }
@ -1781,7 +1786,7 @@ std::string cmSystemTools::CollapseFullPath(const char* in_relative,
const char* in_base) const char* in_base)
{ {
std::string dir, file; std::string dir, file;
cmSystemTools::SplitProgramPath(in_relative, dir, file); cmSystemTools::SplitProgramPath(in_relative, dir, file, false);
// Save original working directory. // Save original working directory.
std::string orig = cmSystemTools::GetCurrentWorkingDirectory(); std::string orig = cmSystemTools::GetCurrentWorkingDirectory();

3
Source/cmSystemTools.h
View File

@ -264,7 +264,8 @@ public:
static std::string GetProgramPath(const char*); static std::string GetProgramPath(const char*);
static void SplitProgramPath(const char* in_name, static void SplitProgramPath(const char* in_name,
std::string& dir, std::string& dir,
std::string& file); std::string& file,
bool errorReport = true);
static std::string CollapseFullPath(const char* in_relative); static std::string CollapseFullPath(const char* in_relative);
static std::string CollapseFullPath(const char* in_relative, static std::string CollapseFullPath(const char* in_relative,
const char* in_base); const char* in_base);