Merge topic 'transitive-property-PP-FOR_EACH'

0d8db25 Use a preprocessor loop to manage the valid transitive properties.

1 files changed, 15 insertions, 9 deletions

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 04ade4a..701c547 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -488,11 +488,13 @@ static const struct JoinNode : public cmGeneratorExpressionNode
   }
 } joinNode;
 
+#define TRANSITIVE_PROPERTY_NAME(PROPERTY) \
+  , #PROPERTY
+
 //----------------------------------------------------------------------------
 static const char* targetPropertyTransitiveWhitelist[] = {
-    "INTERFACE_INCLUDE_DIRECTORIES"
-  , "INTERFACE_COMPILE_DEFINITIONS"
-  , "INTERFACE_COMPILE_OPTIONS"
+  0
+  CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(TRANSITIVE_PROPERTY_NAME)
 };
 
 std::string getLinkedTargetsContent(const std::vector<std::string> &libraries,
@@ -672,7 +674,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       // No error. We just skip cyclic references.
       return std::string();
     case cmGeneratorExpressionDAGChecker::ALREADY_SEEN:
-      for (size_t i = 0;
+      for (size_t i = 1;
           i < (sizeof(targetPropertyTransitiveWhitelist) /
                 sizeof(*targetPropertyTransitiveWhitelist));
           ++i)
@@ -700,9 +702,13 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         }
       else
         {
-        assert(dagCheckerParent->EvaluatingIncludeDirectories()
-            || dagCheckerParent->EvaluatingCompileDefinitions()
-            || dagCheckerParent->EvaluatingCompileOptions());
+#define ASSERT_TRANSITIVE_PROPERTY_METHOD(METHOD) \
+  dagCheckerParent->METHOD () ||
+
+        assert(
+          CM_FOR_EACH_TRANSITIVE_PROPERTY_METHOD(
+                                            ASSERT_TRANSITIVE_PROPERTY_METHOD)
+          false);
         }
       }
 
@@ -729,7 +735,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
 
     cmTarget *headTarget = context->HeadTarget ? context->HeadTarget : target;
 
-    const char **transBegin = targetPropertyTransitiveWhitelist;
+    const char **transBegin = targetPropertyTransitiveWhitelist + 1;
     const char **transEnd = targetPropertyTransitiveWhitelist
               + (sizeof(targetPropertyTransitiveWhitelist) /
               sizeof(*targetPropertyTransitiveWhitelist));
@@ -795,7 +801,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       return linkedTargetsContent;
       }
 
-    for (size_t i = 0;
+    for (size_t i = 1;
          i < (sizeof(targetPropertyTransitiveWhitelist) /
               sizeof(*targetPropertyTransitiveWhitelist));
          ++i)