[Cmake-commits] CMake branch, next, updated. v2.8.5-1773-g2145e2a

[David Cole]

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  2145e2ac47607e0922875fb287968bb14158baf4 (commit)
       via  0c28b48d9b46415964ddaabf082dbdc059c770c2 (commit)
      from  c496437203ca868f9e65572e4b7af9119f8d9bca (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=2145e2ac47607e0922875fb287968bb14158baf4
commit 2145e2ac47607e0922875fb287968bb14158baf4
Merge: c496437 0c28b48
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 1 09:37:43 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 1 09:37:43 2011 -0400

    Merge topic 'save-cache-at-end-of-generate' into next
    
    0c28b48 CMake: Add SaveCache at the end of successful Generate calls


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c28b48d9b46415964ddaabf082dbdc059c770c2
commit 0c28b48d9b46415964ddaabf082dbdc059c770c2
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 1 08:49:00 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Sep 1 08:49:00 2011 -0400

    CMake: Add SaveCache at the end of successful Generate calls
    
    Without this call, recent refactoring changes in the Visual
    Studio generators yield no GUIDs saved in the cache. Putting
    the SaveCache here *once* avoids scattering many calls to it
    in specific generators.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2b8c718..86fd069 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2531,6 +2531,13 @@ int cmake::Generate()
     this->ReportUndefinedPropertyAccesses
       (this->GetProperty("REPORT_UNDEFINED_PROPERTIES"));
     }
+  // Save the cache again after a successful Generate so that any internal
+  // variables created during Generate are saved. (Specifically target GUIDs
+  // for the Visual Studio and Xcode generators.)
+  if ( this->GetWorkingMode() == NORMAL_MODE )
+    {
+    this->CacheManager->SaveCache(this->GetHomeOutputDirectory());
+    }
   return 0;
 }
 

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

Summary of changes:
 Source/cmake.cxx |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake