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

BUG: the -P option was not working with relative paths and a couple types

This commit is contained in:
Ken Martin 2005-09-23 12:50:09 -04:00
parent 244f5ec26a
commit 9be341383e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmake.cxx
View File

@ -283,7 +283,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
std::string path = args[i];
if ( path.size() == 0 )
{
cmSystemTools::Error("No cmake scrpt provided.");
cmSystemTools::Error("No cmake script provided.");
return false;
}
std::cerr << "Running cmake script file " << path.c_str() << "\n";
@ -312,10 +312,17 @@ void cmake::ReadListFile(const char *path)
{
std::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator());
lg->SetGlobalGenerator(gg);
lg->GetMakefile()->SetHomeOutputDirectory
(cmSystemTools::GetCurrentWorkingDirectory().c_str());
lg->GetMakefile()->SetStartOutputDirectory
(cmSystemTools::GetCurrentWorkingDirectory().c_str());
lg->GetMakefile()->SetHomeDirectory
(cmSystemTools::GetCurrentWorkingDirectory().c_str());
lg->GetMakefile()->SetStartDirectory
(cmSystemTools::GetCurrentWorkingDirectory().c_str());
if (!lg->GetMakefile()->ReadListFile(0, path))
{
std::cerr << "Error in reading cmake initial cache file:"
<< path << "\n";
std::cerr << "Error processing file:" << path << "\n";
}
}