Collect targets and libs on demand instead of in the ctor

This is necessary for the next commit which requires that
the targets are collected after the settings have been read.

Alex

1 files changed, 8 insertions, 2 deletions

diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index c9e5fbdc4a..88842a6f0c 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -15,6 +15,7 @@
 #include "cmLocalGenerator.h"
 #include "cmGeneratedFileStream.h"
 #include "cmTarget.h"
+#include <cmsys/RegularExpression.hxx>
 
 
 /** This class implements writing files for graphviz (dot) for graphs
@@ -34,9 +35,11 @@ public:
 
 protected:
 
-  int collectAllTargets();
+  void CollectTargetsAndLibs();
 
-  int collectAllExternalLibs(int cnt);
+  int CollectAllTargets();
+
+  int CollectAllExternalLibs(int cnt);
 
   void WriteHeader(cmGeneratedFileStream& str) const;
 
@@ -65,6 +68,8 @@ protected:
   bool GenerateForSharedLibs;
   bool GenerateForModuleLibs;
 
+  cmsys::RegularExpression TargetIgnoreRegex;
+
   std::set<cmStdString> TargetsToIgnore;
 
   const std::vector<cmLocalGenerator*>& LocalGenerators;
@@ -73,6 +78,7 @@ protected:
   // maps from the actual target names to node names in dot:
   std::map<cmStdString, cmStdString> TargetNamesNodes;
 
+  bool HaveTargetsAndLibs;
 };
 
 #endif