diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-21 13:39:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-21 13:39:53 (GMT) |
| commit | 81c01d4a3461cf645ff3db794cf6217318f268d3 (patch) | |
| tree | c1442153b091f744436d07e3b6c6dde8d9bfa2d0 /Source/CPack | |
| parent | 0d852d4c6525594a6dea8c95db629b7341bc21d3 (diff) | |
| parent | 8090904198238bce7108d7734099f35c9d1bfab2 (diff) | |
| download | CMake-81c01d4a3461cf645ff3db794cf6217318f268d3.zip CMake-81c01d4a3461cf645ff3db794cf6217318f268d3.tar.gz CMake-81c01d4a3461cf645ff3db794cf6217318f268d3.tar.bz2 | |
Merge topic 'disable-cmMakefile-copy'
80909041 cmMakefile: Disable copy constructor.
f3af9517 CPack: Don't copy cmMakefile. Just push a scope instead.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cpack.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 2752270..2207873 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -356,8 +356,8 @@ int main (int argc, char const* const* argv) ++it ) { const char* gen = it->c_str(); - cmMakefile newMF(*globalMF); - cmMakefile* mf = &newMF; + cmMakefile::ScopePushPop raii(globalMF); + cmMakefile* mf = globalMF; cmCPack_Log(&log, cmCPackLog::LOG_VERBOSE, "Specified generator: " << gen << std::endl); if ( parsed && !mf->GetDefinition("CPACK_PACKAGE_NAME") ) |