Commit badbd8dc authored by Bill Hoffman's avatar Bill Hoffman
Browse files

Fix for include optional

parent 217f4b76
......@@ -1734,7 +1734,8 @@ std::string cmSystemTools::GetProgramPath(const char* in_name)
*/
void cmSystemTools::SplitProgramPath(const char* in_name,
std::string& dir,
std::string& file)
std::string& file,
bool errorReport)
{
dir = in_name;
file = "";
......@@ -1758,9 +1759,13 @@ void cmSystemTools::SplitProgramPath(const char* in_name,
{
std::string oldDir = in_name;
cmSystemTools::ConvertToUnixSlashes(oldDir);
cmSystemTools::Error("Error splitting file name off end of path:\n",
oldDir.c_str(), "\nDirectory not found: ",
dir.c_str());
if(errorReport)
{
cmSystemTools::Error("Error splitting file name off end of path:\n",
oldDir.c_str(), "\nDirectory not found: ",
dir.c_str());
}
dir = in_name;
return;
}
......@@ -1781,7 +1786,7 @@ std::string cmSystemTools::CollapseFullPath(const char* in_relative,
const char* in_base)
{
std::string dir, file;
cmSystemTools::SplitProgramPath(in_relative, dir, file);
cmSystemTools::SplitProgramPath(in_relative, dir, file, false);
// Save original working directory.
std::string orig = cmSystemTools::GetCurrentWorkingDirectory();
......
......@@ -264,7 +264,8 @@ public:
static std::string GetProgramPath(const char*);
static void SplitProgramPath(const char* in_name,
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,
const char* in_base);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment