summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-02-07 20:35:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-02-07 20:35:32 (GMT)
commit2619d765567bd4bee8e5976a2c5967d36487cdd6 (patch)
treede587c8ffa68c9baa77b9c0934265b24257e51ba /Source/cmake.cxx
parent3921f1a559053dcf8c894321cb505dc4d24b3685 (diff)
parentc8ef6430e09c063b74708ef0cd28f533c15fd8bd (diff)
downloadCMake-2619d765567bd4bee8e5976a2c5967d36487cdd6.zip
CMake-2619d765567bd4bee8e5976a2c5967d36487cdd6.tar.gz
CMake-2619d765567bd4bee8e5976a2c5967d36487cdd6.tar.bz2
Merge topic 'warn-funny-path-names'
c8ef643 Allow directory names containing '=' and warn if necessary (#12934)
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r--Source/cmake.cxx24
1 files changed, 0 insertions, 24 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c0c73d6..71dca3a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2126,32 +2126,8 @@ 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();