diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-30 23:43:31 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-28 16:44:38 (GMT) |
| commit | acb006229dbc531303538f4de1dc4d16d27369a5 (patch) | |
| tree | 72c546947ad69df5c89662f9b0a2a53e6f76ed81 /Source/CPack | |
| parent | 83b8a927e5a992480e96b0be36ea0426a924c41f (diff) | |
| download | CMake-acb006229dbc531303538f4de1dc4d16d27369a5.zip CMake-acb006229dbc531303538f4de1dc4d16d27369a5.tar.gz CMake-acb006229dbc531303538f4de1dc4d16d27369a5.tar.bz2 | |
cmGlobalGenerator: Require a snapshot to create a local generator.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/CPack/cpack.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index bf4df60..68509a5 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -716,7 +716,8 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cm.AddCMakePaths(); cm.SetProgressCallback(cmCPackGeneratorProgress, this); cmGlobalGenerator gg(&cm); - cmsys::auto_ptr<cmLocalGenerator> lg(gg.MakeLocalGenerator()); + cmsys::auto_ptr<cmLocalGenerator> lg( + gg.MakeLocalGenerator(cm.GetCurrentSnapshot())); cmMakefile *mf = lg->GetMakefile(); std::string realInstallDirectory = tempInstallDirectory; if ( !installSubDirectory.empty() && installSubDirectory != "/" ) diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index c2fe763..0c53d1b 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -202,7 +202,8 @@ int main (int argc, char const* const* argv) cminst.SetHomeOutputDirectory(""); cminst.GetState()->RemoveUnscriptableCommands(); cmGlobalGenerator cmgg(&cminst); - cmsys::auto_ptr<cmLocalGenerator> cmlg(cmgg.MakeLocalGenerator()); + cmsys::auto_ptr<cmLocalGenerator> cmlg( + cmgg.MakeLocalGenerator(cminst.GetCurrentSnapshot())); cmMakefile* globalMF = cmlg->GetMakefile(); #if defined(__CYGWIN__) globalMF->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0"); |