diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-10-29 08:22:32 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-11-09 19:31:35 (GMT) |
| commit | 146493363ebcb7618e5da175f89b69fcc4f9bb16 (patch) | |
| tree | 2bef0c685396f906424ca00e55840acc7db5c3b0 | |
| parent | dcac9be6aa33601db1b32f4efd9f724a97f8844b (diff) | |
| download | CMake-146493363ebcb7618e5da175f89b69fcc4f9bb16.zip CMake-146493363ebcb7618e5da175f89b69fcc4f9bb16.tar.gz CMake-146493363ebcb7618e5da175f89b69fcc4f9bb16.tar.bz2 | |
Genex: Simplify the preprocessor looper for interface properties.
By removing the INTERFACE_ prefix, we can use this in more contexts.
| -rw-r--r-- | Source/cmExportTryCompileFileGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGeneratorExpressionDAGChecker.h | 8 | ||||
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx index b70fed6..d9bc04c 100644 --- a/Source/cmExportTryCompileFileGenerator.cxx +++ b/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) diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h index 0b7ef02..c8594e7 100644 --- a/Source/cmGeneratorExpressionDAGChecker.h +++ b/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 diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 107ef73..2d26053 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/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[] = { |