diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-13 19:48:46 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-13 22:16:20 (GMT) |
| commit | 20b95ef8c83fbcb7705e72c85c9de18ff420562f (patch) | |
| tree | 7241038f255ebe43bd6fefd8e2efd7533ae3167d /Source/CPack | |
| parent | 841164cb36650574a1a7363c78e4cdf28d5d37fd (diff) | |
| download | CMake-20b95ef8c83fbcb7705e72c85c9de18ff420562f.zip CMake-20b95ef8c83fbcb7705e72c85c9de18ff420562f.tar.gz CMake-20b95ef8c83fbcb7705e72c85c9de18ff420562f.tar.bz2 | |
cmState: Initialize default definitions immediately.
Don't leave this as cmMakefile responsibility.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/CPack/cpack.cxx | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 2f69c25..22d4bf0 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -717,6 +717,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cmake cm; cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); + cm.GetCurrentSnapshot().SetDefaultDefinitions(); cm.AddCMakePaths(); cm.SetProgressCallback(cmCPackGeneratorProgress, this); cmGlobalGenerator gg(&cm); diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index f6447ec..c08897f 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -199,6 +199,7 @@ int main (int argc, char const* const* argv) cmake cminst; cminst.SetHomeDirectory(""); cminst.SetHomeOutputDirectory(""); + cminst.GetCurrentSnapshot().SetDefaultDefinitions(); cminst.GetState()->RemoveUnscriptableCommands(); cmGlobalGenerator cmgg(&cminst); cmsys::auto_ptr<cmMakefile> globalMF( |