diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-19 15:09:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-19 15:09:39 (GMT) |
| commit | be248ab435b4a538f29337b8d136729436a816b4 (patch) | |
| tree | 3c4588a3f490b5c5ec38f0867075711d38263ba9 /Source/cmake.cxx | |
| parent | 0cbc69b9ea97a44280350a58a365c617896e4589 (diff) | |
| parent | fa9eb814b36894635e22ffdcac3103ee980b0398 (diff) | |
| download | CMake-be248ab435b4a538f29337b8d136729436a816b4.zip CMake-be248ab435b4a538f29337b8d136729436a816b4.tar.gz CMake-be248ab435b4a538f29337b8d136729436a816b4.tar.bz2 | |
Merge topic 'refactor-cmLocalGenerator'
fa9eb814 cmLocalGenerator: Remove redundant path access.
1933f3d1 cmLocalGenerator: Remove redundant path conversions.
9e4b6cc2 cmState: Store computed relative paths to to current directories.
991f5e49 cmState::Snapshot: Store components for current directories.
57bdc1a2 cmState: Compute and store directory components.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index d783976..b2c603f 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1925,6 +1925,8 @@ int cmake::CheckBuildSystem() // Read the rerun check file and use it to decide whether to do the // global generate. cmake cm; + cm.SetHomeDirectory(""); + cm.SetHomeOutputDirectory(""); cmGlobalGenerator gg; gg.SetCMakeInstance(&cm); cmsys::auto_ptr<cmLocalGenerator> lg(gg.MakeLocalGenerator()); @@ -2565,6 +2567,9 @@ int cmake::Build(const std::string& dir, const std::vector<std::string>& nativeOptions, bool clean) { + + this->SetHomeDirectory(""); + this->SetHomeOutputDirectory(""); if(!cmSystemTools::FileIsDirectory(dir)) { std::cerr << "Error: " << dir << " is not a directory\n"; |