Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Brad King
CMake
Commits
14649336
Commit
14649336
authored
Oct 29, 2013
by
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
Changes
3
Show whitespace changes
Inline
Side-by-side
Source/cmExportTryCompileFileGenerator.cxx
View file @
14649336
...
@@ -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
)
...
...
Source/cmGeneratorExpressionDAGChecker.h
View file @
14649336
...
@@ -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
...
...
Source/cmGeneratorExpressionEvaluator.cxx
View file @
14649336
...
@@ -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
[]
=
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment