summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2003-10-30 00:49:50 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2003-10-30 00:49:50 (GMT)
commitd21532cd02e18b1677983849a9f5d7454e24bb74 (patch)
treed0b5b80e42b4c0915787bbbcd9ae6f6065f82353 /Source/cmake.cxx
parent3b7c4b2a7b784a767bcf31774014d06b97c98d4f (diff)
downloadCMake-d21532cd02e18b1677983849a9f5d7454e24bb74.zip
CMake-d21532cd02e18b1677983849a9f5d7454e24bb74.tar.gz
CMake-d21532cd02e18b1677983849a9f5d7454e24bb74.tar.bz2
ENH: Ok, no more argument needed for script mode
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r--Source/cmake.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index da7d290..cb442c2 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -215,9 +215,9 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
std::cerr << "loading initial cache file " << path.c_str() << "\n";
this->ReadListFile(path.c_str());
}
- else if(arg.find("-M",0) == 0)
+ else if(arg.find("--script",0) == 0)
{
- std::string path = arg.substr(2);
+ std::string path = arg.substr(strlen("--script"));
if ( path.size() == 0 )
{
cmSystemTools::Error("No cmake scrpt provided.");
@@ -308,7 +308,7 @@ void cmake::SetArgs(const std::vector<std::string>& args)
{
// skip for now
}
- else if(arg.find("-M",0) == 0)
+ else if(arg.find("--script",0) == 0)
{
// skip for now
}
@@ -848,6 +848,7 @@ int cmake::DoPreConfigureChecks()
cmSystemTools::Error(
"The source directory does not appear to contain CMakeLists.txt.\n"
"Specify --help for usage, or press the help button on the CMake GUI.");
+ abort();
return -2;
}