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

Reject directory names containing '=' (#11689) 

Some characters are not well-supported by native build systems.  Reject
paths containing such characters before even trying to configure a
project.
This commit is contained in:
Brad King 2011-01-14 10:03:22 -05:00
parent 28a0403c34
commit 8704525f20
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/cmake.cxx
View File

@ -1946,8 +1946,32 @@ int cmake::Configure()
}
bool cmake::RejectUnsupportedPaths(const char* desc, std::string const& path)
{
// Some characters are not well-supported by native build systems.
std::string::size_type pos = path.find_first_of("=");
if(pos == std::string::npos)
{
return false;
}
cmOStringStream e;
e << "The path to the " << desc << " directory:\n"
<< " " << path << "\n"
<< "contains unsupported character '" << path[pos] << "'.\n"
<< "Please use a different " << desc << " directory name.";
cmListFileBacktrace bt;
this->IssueMessage(cmake::FATAL_ERROR, e.str(), bt);
return true;
}
int cmake::ActualConfigure()
{
if(this->RejectUnsupportedPaths("source", this->cmHomeDirectory) ||
this->RejectUnsupportedPaths("binary", this->HomeOutputDirectory))
{
return 1;
}
// Construct right now our path conversion table before it's too late:
this->UpdateConversionPathTable();
this->CleanupCommandsAndMacros();

2
Source/cmake.h
View File

@ -435,6 +435,8 @@ protected:
///! Find the full path to one of the cmake programs like ctest, cpack, etc.
std::string FindCMakeProgram(const char* name) const;
bool RejectUnsupportedPaths(const char* desc, std::string const& path);
private:
cmake(const cmake&); // Not implemented.
void operator=(const cmake&); // Not implemented.