[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4025-ge4de636

[Brad King]

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  e4de636716499628cce05a2127b5b5ffda46c86e (commit)
       via  e478f0346934d3f1e44f62d87861ec5288e703b7 (commit)
      from  a13d3b82a69f325413fc859caa8b4e59d9bd4fb6 (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=e4de636716499628cce05a2127b5b5ffda46c86e
commit e4de636716499628cce05a2127b5b5ffda46c86e
Merge: a13d3b8 e478f03
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 28 08:59:37 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 28 08:59:37 2013 -0400

    Merge topic 'vs-no-regen-external-msproject' into next
    
    e478f03 VS: Fix CMAKE_SUPPRESS_REGENERATION bad ZERO_CHECK dependency (#14378)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e478f0346934d3f1e44f62d87861ec5288e703b7
commit e478f0346934d3f1e44f62d87861ec5288e703b7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 27 14:15:49 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 28 08:57:12 2013 -0400

    VS: Fix CMAKE_SUPPRESS_REGENERATION bad ZERO_CHECK dependency (#14378)
    
    When CMAKE_SUPPRESS_REGENERATION tells us not to create the ZERO_CHECK
    target we should not add dependencies on it from other targets either.
    
    Reviewed-by: Mateusz Loskot <mateusz at loskot.net>

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index e4244e0..1a4c7ff 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -202,7 +202,7 @@ std::string cmGlobalVisualStudio8Generator::GetUserMacrosRegKeyBase()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudio8Generator::AddCheckTarget()
+bool cmGlobalVisualStudio8Generator::AddCheckTarget()
 {
   // Add a special target on which all other targets depend that
   // checks the build system and optionally re-runs CMake.
@@ -216,7 +216,7 @@ void cmGlobalVisualStudio8Generator::AddCheckTarget()
   // Skip the target if no regeneration is to be done.
   if(mf->IsOn("CMAKE_SUPPRESS_REGENERATION"))
     {
-    return;
+    return false;
     }
 
   std::string cmake_command = mf->GetRequiredDefinition("CMAKE_COMMAND");
@@ -315,21 +315,24 @@ void cmGlobalVisualStudio8Generator::AddCheckTarget()
     cmSystemTools::Error("Error adding rule for ", stamps[0].c_str());
     }
   }
+
+  return true;
 }
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio8Generator::Generate()
 {
-  this->AddCheckTarget();
-
-  // All targets depend on the build-system check target.
-  for(std::map<cmStdString,cmTarget *>::const_iterator
-        ti = this->TotalTargets.begin();
-      ti != this->TotalTargets.end(); ++ti)
+  if(this->AddCheckTarget())
     {
-    if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+    // All targets depend on the build-system check target.
+    for(std::map<cmStdString,cmTarget *>::const_iterator
+          ti = this->TotalTargets.begin();
+        ti != this->TotalTargets.end(); ++ti)
       {
-      ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+      if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+        {
+        ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+        }
       }
     }
 
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index d181742..2376f8a 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -71,7 +71,7 @@ protected:
 
   virtual bool VSLinksDependencies() const { return false; }
 
-  void AddCheckTarget();
+  bool AddCheckTarget();
 
   static cmIDEFlagTable const* GetExtraFlagTableVS8();
   virtual void WriteSLNHeader(std::ostream& fout);

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

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |   23 +++++++++++++----------
 Source/cmGlobalVisualStudio8Generator.h   |    2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake