[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4052-gd5a4faf

[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  d5a4fafbb52e4b31c4ae5daa601463e6a60487c3 (commit)
       via  6cf55644ef9dda817ed88fe70abf9da235de1a1a (commit)
      from  a7477f49a53eb7864d4ff5e7f48ab7180ce50763 (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=d5a4fafbb52e4b31c4ae5daa601463e6a60487c3
commit d5a4fafbb52e4b31c4ae5daa601463e6a60487c3
Merge: a7477f4 6cf5564
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 29 11:23:22 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 29 11:23:22 2013 -0400

    Merge topic 'graphviz-at-generate-time' into next
    
    6cf5564 Generate graphviz files at generate time, not configure time.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cf55644ef9dda817ed88fe70abf9da235de1a1a
commit 6cf55644ef9dda817ed88fe70abf9da235de1a1a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 7 13:10:24 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 29 17:18:02 2013 +0200

    Generate graphviz files at generate time, not configure time.
    
    The feature needs access to all link libraries. In the future that
    will only be possible to calculate at generate-time.
    
    Even when the files were generated at configure time, they were
    generated after user code in CMakeLists files were generated. No
    policy is needed to handle manipulation of the files from CMake
    code, because that was never possible.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 290aff0..8b8cb01 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2437,11 +2437,6 @@ int cmake::ActualConfigure()
     {
     this->CacheManager->SaveCache(this->GetHomeOutputDirectory());
     }
-  if ( !this->GraphVizFile.empty() )
-    {
-    std::cout << "Generate graphviz: " << this->GraphVizFile << std::endl;
-    this->GenerateGraphViz(this->GraphVizFile.c_str());
-    }
   if(cmSystemTools::GetErrorOccuredFlag())
     {
     return -1;
@@ -2604,6 +2599,11 @@ int cmake::Generate()
     return -1;
     }
   this->GlobalGenerator->Generate();
+  if ( !this->GraphVizFile.empty() )
+    {
+    std::cout << "Generate graphviz: " << this->GraphVizFile << std::endl;
+    this->GenerateGraphViz(this->GraphVizFile.c_str());
+    }
   if(this->WarnUnusedCli)
     {
     this->RunCheckForUnusedVariables();

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

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


hooks/post-receive
-- 
CMake