Преглед на файлове

Genex: Simplify the preprocessor looper for interface properties.

By removing the INTERFACE_ prefix, we can use this in more contexts.
Stephen Kelly преди 12 години
родител
ревизия
146493363e
променени са 3 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 1 1
      Source/cmExportTryCompileFileGenerator.cxx
  2. 4 4
      Source/cmGeneratorExpressionDAGChecker.h
  3. 1 1
      Source/cmGeneratorExpressionEvaluator.cxx

+ 1 - 1
Source/cmExportTryCompileFileGenerator.cxx

@@ -32,7 +32,7 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
       ImportPropertyMap properties;
 
 #define FIND_TARGETS(PROPERTY) \
-      this->FindTargets(#PROPERTY, te, emittedDeps);
+      this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
 
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
 

+ 4 - 4
Source/cmGeneratorExpressionDAGChecker.h

@@ -23,10 +23,10 @@
   F(EvaluatingCompileOptions)
 
 #define CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(F) \
-  F(INTERFACE_INCLUDE_DIRECTORIES) \
-  F(INTERFACE_SYSTEM_INCLUDE_DIRECTORIES) \
-  F(INTERFACE_COMPILE_DEFINITIONS) \
-  F(INTERFACE_COMPILE_OPTIONS)
+  F(INCLUDE_DIRECTORIES) \
+  F(SYSTEM_INCLUDE_DIRECTORIES) \
+  F(COMPILE_DEFINITIONS) \
+  F(COMPILE_OPTIONS)
 
 //----------------------------------------------------------------------------
 struct cmGeneratorExpressionDAGChecker

+ 1 - 1
Source/cmGeneratorExpressionEvaluator.cxx

@@ -652,7 +652,7 @@ static const struct JoinNode : public cmGeneratorExpressionNode
 } joinNode;
 
 #define TRANSITIVE_PROPERTY_NAME(PROPERTY) \
-  , #PROPERTY
+  , "INTERFACE_" #PROPERTY
 
 //----------------------------------------------------------------------------
 static const char* targetPropertyTransitiveWhitelist[] = {