[Cmake-commits] CMake branch, next, updated. v3.2.2-1992-gfba9de3

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fba9de3c35c554d87d20d10d7bd44404e55f46a9 (commit)
       via  8090904198238bce7108d7734099f35c9d1bfab2 (commit)
       via  f3af9517ff6152a9e1548d73404ce64991855482 (commit)
      from  9221bbafe95a3fa4dfd99ace48c1d9be5fe889d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fba9de3c35c554d87d20d10d7bd44404e55f46a9
commit fba9de3c35c554d87d20d10d7bd44404e55f46a9
Merge: 9221bba 8090904
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 20 18:27:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 20 18:27:30 2015 -0400

    Merge topic 'disable-cmMakefile-copy' into next
    
    80909041 cmMakefile: Disable copy constructor.
    f3af9517 CPack: Don't copy cmMakefile. Just push a scope instead.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8090904198238bce7108d7734099f35c9d1bfab2
commit 8090904198238bce7108d7734099f35c9d1bfab2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 18 16:38:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 21 00:26:37 2015 +0200

    cmMakefile: Disable copy constructor.
    
    It is no longer necessary to be able to copy it.  Additionally, this
    gives us one less reason to copy cmTarget.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7be920d..83efc05 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -106,52 +106,6 @@ cmMakefile::cmMakefile(): Internal(new Internals)
   this->SuppressWatches = false;
 }
 
-cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals)
-{
-  this->Internal->VarStack.push(mf.Internal->VarStack.top().Closure());
-  this->Internal->VarInitStack.push(mf.Internal->VarInitStack.top());
-  this->Internal->VarUsageStack.push(mf.Internal->VarUsageStack.top());
-
-  this->cmStartDirectory = mf.cmStartDirectory;
-  this->StartOutputDirectory = mf.StartOutputDirectory;
-  this->cmHomeDirectory = mf.cmHomeDirectory;
-  this->HomeOutputDirectory = mf.HomeOutputDirectory;
-  this->cmCurrentListFile = mf.cmCurrentListFile;
-  this->ProjectName = mf.ProjectName;
-  this->Targets = mf.Targets;
-  this->SourceFiles = mf.SourceFiles;
-  this->Tests = mf.Tests;
-  this->LinkDirectories = mf.LinkDirectories;
-  this->SystemIncludeDirectories = mf.SystemIncludeDirectories;
-  this->ListFiles = mf.ListFiles;
-  this->OutputFiles = mf.OutputFiles;
-  this->LinkLibraries = mf.LinkLibraries;
-  this->InstallGenerators = mf.InstallGenerators;
-  this->TestGenerators = mf.TestGenerators;
-  this->IncludeFileRegularExpression = mf.IncludeFileRegularExpression;
-  this->ComplainFileRegularExpression = mf.ComplainFileRegularExpression;
-  this->SourceFileExtensions = mf.SourceFileExtensions;
-  this->HeaderFileExtensions = mf.HeaderFileExtensions;
-  this->DefineFlags = mf.DefineFlags;
-  this->DefineFlagsOrig = mf.DefineFlagsOrig;
-
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-  this->SourceGroups = mf.SourceGroups;
-#endif
-
-  this->LocalGenerator = mf.LocalGenerator;
-  this->FunctionBlockers = mf.FunctionBlockers;
-  this->MacrosList = mf.MacrosList;
-  this->Properties = mf.Properties;
-  this->WarnUnused = mf.WarnUnused;
-  this->Initialize();
-  this->CheckSystemVars = mf.CheckSystemVars;
-  this->ListFileStack = mf.ListFileStack;
-  this->OutputToSource = mf.OutputToSource;
-
-  this->SuppressWatches = mf.SuppressWatches;
-}
-
 //----------------------------------------------------------------------------
 void cmMakefile::Initialize()
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 73d6910..e3566c5 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -75,7 +75,6 @@ public:
    * Construct an empty makefile.
    */
   cmMakefile();
-  cmMakefile(const cmMakefile& mf);
 
   /**
    * Destructor.
@@ -988,6 +987,8 @@ protected:
                          cmExecutionStatus &status);
 
 private:
+  cmMakefile(const cmMakefile& mf);
+  cmMakefile& operator=(const cmMakefile& mf);
   void Initialize();
 
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3af9517ff6152a9e1548d73404ce64991855482
commit f3af9517ff6152a9e1548d73404ce64991855482
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 18 16:36:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 21 00:21:53 2015 +0200

    CPack: Don't copy cmMakefile. Just push a scope instead.

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") )

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cpack.cxx |    4 ++--
 Source/cmMakefile.cxx  |   46 ----------------------------------------------
 Source/cmMakefile.h    |    3 ++-
 3 files changed, 4 insertions(+), 49 deletions(-)


hooks/post-receive
-- 
CMake