1 files changed, 31 insertions, 32 deletions

diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h
index c6c8901af5..28ca824a6e 100644
--- a/Source/cmGeneratorExpressionDAGChecker.h
+++ b/Source/cmGeneratorExpressionDAGChecker.h
@@ -20,37 +20,38 @@
 #define CM_SELECT_FIRST(F, A1, A2) F(A1)
 #define CM_SELECT_SECOND(F, A1, A2) F(A2)
 
-#define CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, SELECT) \
-  SELECT(F, EvaluatingIncludeDirectories,       INCLUDE_DIRECTORIES) \
-  SELECT(F, EvaluatingSystemIncludeDirectories, SYSTEM_INCLUDE_DIRECTORIES) \
-  SELECT(F, EvaluatingCompileDefinitions,       COMPILE_DEFINITIONS) \
-  SELECT(F, EvaluatingCompileOptions,           COMPILE_OPTIONS) \
-  SELECT(F, EvaluatingAutoUicOptions,           AUTOUIC_OPTIONS) \
-  SELECT(F, EvaluatingSources,                  SOURCES) \
-  SELECT(F, EvaluatingCompileFeatures,          COMPILE_FEATURES)
-
-#define CM_FOR_EACH_TRANSITIVE_PROPERTY(F) \
+#define CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, SELECT)                       \
+  SELECT(F, EvaluatingIncludeDirectories, INCLUDE_DIRECTORIES)                \
+  SELECT(F, EvaluatingSystemIncludeDirectories, SYSTEM_INCLUDE_DIRECTORIES)   \
+  SELECT(F, EvaluatingCompileDefinitions, COMPILE_DEFINITIONS)                \
+  SELECT(F, EvaluatingCompileOptions, COMPILE_OPTIONS)                        \
+  SELECT(F, EvaluatingAutoUicOptions, AUTOUIC_OPTIONS)                        \
+  SELECT(F, EvaluatingSources, SOURCES)                                       \
+  SELECT(F, EvaluatingCompileFeatures, COMPILE_FEATURES)
+
+#define CM_FOR_EACH_TRANSITIVE_PROPERTY(F)                                    \
   CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, CM_SELECT_BOTH)
 
-#define CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(F) \
+#define CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(F)                             \
   CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, CM_SELECT_FIRST)
 
-#define CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(F) \
+#define CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(F)                               \
   CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, CM_SELECT_SECOND)
 
 struct cmGeneratorExpressionDAGChecker
 {
-  cmGeneratorExpressionDAGChecker(const cmListFileBacktrace &backtrace,
-                                  const std::string &target,
-                                  const std::string &property,
-                                  const GeneratorExpressionContent *content,
-                                  cmGeneratorExpressionDAGChecker *parent);
-  cmGeneratorExpressionDAGChecker(const std::string &target,
-                                  const std::string &property,
-                                  const GeneratorExpressionContent *content,
-                                  cmGeneratorExpressionDAGChecker *parent);
-
-  enum Result {
+  cmGeneratorExpressionDAGChecker(const cmListFileBacktrace& backtrace,
+                                  const std::string& target,
+                                  const std::string& property,
+                                  const GeneratorExpressionContent* content,
+                                  cmGeneratorExpressionDAGChecker* parent);
+  cmGeneratorExpressionDAGChecker(const std::string& target,
+                                  const std::string& property,
+                                  const GeneratorExpressionContent* content,
+                                  cmGeneratorExpressionDAGChecker* parent);
+
+  enum Result
+  {
     DAG,
     SELF_REFERENCE,
     CYCLIC_REFERENCE,
@@ -59,21 +60,19 @@ struct cmGeneratorExpressionDAGChecker
 
   Result Check() const;
 
-  void ReportError(cmGeneratorExpressionContext *context,
-                   const std::string &expr);
+  void ReportError(cmGeneratorExpressionContext* context,
+                   const std::string& expr);
 
-  bool EvaluatingLinkLibraries(const char *tgt = 0);
+  bool EvaluatingLinkLibraries(const char* tgt = 0);
 
-#define DECLARE_TRANSITIVE_PROPERTY_METHOD(METHOD) \
-  bool METHOD () const;
+#define DECLARE_TRANSITIVE_PROPERTY_METHOD(METHOD) bool METHOD() const;
 
   CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(DECLARE_TRANSITIVE_PROPERTY_METHOD)
 
 #undef DECLARE_TRANSITIVE_PROPERTY_METHOD
 
   bool GetTransitivePropertiesOnly();
-  void SetTransitivePropertiesOnly()
-    { this->TransitivePropertiesOnly = true; }
+  void SetTransitivePropertiesOnly() { this->TransitivePropertiesOnly = true; }
 
   std::string TopTarget() const;
 
@@ -82,11 +81,11 @@ private:
   void Initialize();
 
 private:
-  const cmGeneratorExpressionDAGChecker * const Parent;
+  const cmGeneratorExpressionDAGChecker* const Parent;
   const std::string Target;
   const std::string Property;
   std::map<std::string, std::set<std::string> > Seen;
-  const GeneratorExpressionContent * const Content;
+  const GeneratorExpressionContent* const Content;
   const cmListFileBacktrace Backtrace;
   Result CheckResult;
   bool TransitivePropertiesOnly;