summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2005-09-23 16:50:09 (GMT)
committerKen Martin <ken.martin@kitware.com>2005-09-23 16:50:09 (GMT)
commit9be341383e3b843c75a825e24834d631ffb81613 (patch)
tree37ab1d020007526482680c8b87b5f6396e715732 /Source
parent244f5ec26a4e6eec4498eab61ba0fcde2cc4965c (diff)
downloadCMake-9be341383e3b843c75a825e24834d631ffb81613.zip
CMake-9be341383e3b843c75a825e24834d631ffb81613.tar.gz
CMake-9be341383e3b843c75a825e24834d631ffb81613.tar.bz2
BUG: the -P option was not working with relative paths and a couple types
Diffstat (limited to 'Source')
-rw-r--r--Source/cmake.cxx13
1 files changed, 10 insertions, 3 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index fa4cb0c..ad2a580 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -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";
}
}