[Cmake-commits] CMake branch, next, updated. v2.8.12-4657-g86a694c

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  86a694c5880706e323d3fccc3a7903fcdccc3d2a (commit)
       via  a397eccaeb50f8fa23575a1f0c79518d3214a0e1 (commit)
      from  43cd0418cafaf5675f0dcbfe73fa9bce8a7fc87d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86a694c5880706e323d3fccc3a7903fcdccc3d2a
commit 86a694c5880706e323d3fccc3a7903fcdccc3d2a
Merge: 43cd041 a397ecc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 30 11:29:12 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 30 11:29:12 2013 -0400

    Merge topic 'target_compiler_features' into next
    
    a397ecc Revert "Genex: Simplify the preprocessor looper for interface properties."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a397eccaeb50f8fa23575a1f0c79518d3214a0e1
commit a397eccaeb50f8fa23575a1f0c79518d3214a0e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 30 16:28:41 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 30 16:28:41 2013 +0100

    Revert "Genex: Simplify the preprocessor looper for interface properties."
    
    This reverts commit f9fbd787870f5aca04d48b2c78e83531697a7d3c.

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 5e5e76c..819ac37 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("INTERFACE_" #PROPERTY, te, emittedDeps);
+      this->FindTargets(#PROPERTY, te, emittedDeps);
 
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
 
diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h
index c8594e7..0b7ef02 100644
--- a/Source/cmGeneratorExpressionDAGChecker.h
+++ b/Source/cmGeneratorExpressionDAGChecker.h
@@ -23,10 +23,10 @@
   F(EvaluatingCompileOptions)
 
 #define CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(F) \
-  F(INCLUDE_DIRECTORIES) \
-  F(SYSTEM_INCLUDE_DIRECTORIES) \
-  F(COMPILE_DEFINITIONS) \
-  F(COMPILE_OPTIONS)
+  F(INTERFACE_INCLUDE_DIRECTORIES) \
+  F(INTERFACE_SYSTEM_INCLUDE_DIRECTORIES) \
+  F(INTERFACE_COMPILE_DEFINITIONS) \
+  F(INTERFACE_COMPILE_OPTIONS)
 
 //----------------------------------------------------------------------------
 struct cmGeneratorExpressionDAGChecker
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index d51b5c8..f92c18e 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) \
-  , "INTERFACE_" #PROPERTY
+  , #PROPERTY
 
 //----------------------------------------------------------------------------
 static const char* targetPropertyTransitiveWhitelist[] = {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportTryCompileFileGenerator.cxx |    2 +-
 Source/cmGeneratorExpressionDAGChecker.h   |    8 ++++----
 Source/cmGeneratorExpressionEvaluator.cxx  |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake