Commit 14649336 authored by Stephen Kelly's avatar Stephen Kelly
Browse files

Genex: Simplify the preprocessor looper for interface properties.

By removing the INTERFACE_ prefix, we can use this in more contexts.
parent dcac9be6
...@@ -32,7 +32,7 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os) ...@@ -32,7 +32,7 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
ImportPropertyMap properties; ImportPropertyMap properties;
#define FIND_TARGETS(PROPERTY) \ #define FIND_TARGETS(PROPERTY) \
this->FindTargets(#PROPERTY, te, emittedDeps); this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS) CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
F(EvaluatingCompileOptions) F(EvaluatingCompileOptions)
#define CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(F) \ #define CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(F) \
F(INTERFACE_INCLUDE_DIRECTORIES) \ F(INCLUDE_DIRECTORIES) \
F(INTERFACE_SYSTEM_INCLUDE_DIRECTORIES) \ F(SYSTEM_INCLUDE_DIRECTORIES) \
F(INTERFACE_COMPILE_DEFINITIONS) \ F(COMPILE_DEFINITIONS) \
F(INTERFACE_COMPILE_OPTIONS) F(COMPILE_OPTIONS)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
struct cmGeneratorExpressionDAGChecker struct cmGeneratorExpressionDAGChecker
......
...@@ -652,7 +652,7 @@ static const struct JoinNode : public cmGeneratorExpressionNode ...@@ -652,7 +652,7 @@ static const struct JoinNode : public cmGeneratorExpressionNode
} joinNode; } joinNode;
#define TRANSITIVE_PROPERTY_NAME(PROPERTY) \ #define TRANSITIVE_PROPERTY_NAME(PROPERTY) \
, #PROPERTY , "INTERFACE_" #PROPERTY
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
static const char* targetPropertyTransitiveWhitelist[] = { static const char* targetPropertyTransitiveWhitelist[] = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment