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/CPack | |
| 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/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/CPack/cpack.cxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 6e30f8c..41614ca 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -711,6 +711,8 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( } cmake cm; + cm.SetHomeDirectory(""); + cm.SetHomeOutputDirectory(""); cm.AddCMakePaths(); cm.SetProgressCallback(cmCPackGeneratorProgress, this); cmGlobalGenerator gg; diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 29484cf..a5109e0 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -198,6 +198,8 @@ int main (int argc, char const* const* argv) "Read CPack config file: " << cpackConfigFile << std::endl); cmake cminst; + cminst.SetHomeDirectory(""); + cminst.SetHomeOutputDirectory(""); cminst.GetState()->RemoveUnscriptableCommands(); cmGlobalGenerator cmgg; cmgg.SetCMakeInstance(&cminst); |