[Cmake-commits] CMake branch, next, updated. v3.0.0-4427-gf51631c

[Brad King]

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  f51631ca91082d941764bca09cd6ffd3556738c1 (commit)
       via  db34736205f35428580fde47d6d51da2e2fbf5d1 (commit)
      from  d0c654609abd352e67a7aacb398d2c6b57e88bd3 (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=f51631ca91082d941764bca09cd6ffd3556738c1
commit f51631ca91082d941764bca09cd6ffd3556738c1
Merge: d0c6546 db34736
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 22 10:58:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 22 10:58:09 2014 -0400

    Merge topic 'revert-stray-topic' into next
    
    db347362 Revert "genex: Allow genex caching of config genex on single-config generators"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db34736205f35428580fde47d6d51da2e2fbf5d1
commit db34736205f35428580fde47d6d51da2e2fbf5d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 22 10:59:06 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 22 10:59:06 2014 -0400

    Revert "genex: Allow genex caching of config genex on single-config generators"
    
    This reverts commit 93d441b5341b3288f113d7e9c3a488bb23497547.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 2581355..3b83cd3 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -15,7 +15,6 @@
 #include "cmGeneratorExpressionParser.h"
 #include "cmGeneratorExpressionDAGChecker.h"
 #include "cmGeneratorExpression.h"
-#include "cmGlobalGenerator.h"
 #include "cmLocalGenerator.h"
 #include "cmSourceFile.h"
 
@@ -689,11 +688,7 @@ static const struct ConfigurationNode : public cmGeneratorExpressionNode
                        const GeneratorExpressionContent *,
                        cmGeneratorExpressionDAGChecker *) const
   {
-    if (context->Makefile->GetLocalGenerator()->
-                           GetGlobalGenerator()->IsMultiConfig())
-      {
-      context->HadContextSensitiveCondition = true;
-      }
+    context->HadContextSensitiveCondition = true;
     return context->Config;
   }
 } configurationNode;
@@ -721,11 +716,7 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
                   "Expression syntax not recognized.");
       return std::string();
       }
-    if (context->Makefile->GetLocalGenerator()->
-                           GetGlobalGenerator()->IsMultiConfig())
-      {
-      context->HadContextSensitiveCondition = true;
-      }
+    context->HadContextSensitiveCondition = true;
     if (context->Config.empty())
       {
       return parameters.front().empty() ? "1" : "0";
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index 57c52e3..fa76f24 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -9,11 +9,7 @@ run_cmake(RelativePathInInterface)
 run_cmake(ImportedTarget)
 run_cmake(RelativePathInGenex)
 run_cmake(CMP0021)
-if (CMAKE_CONFIGURATION_TYPES)
-  # $<CONFIGURATION> is only context-dependent in multi-config
-  # generators.
-  run_cmake(install_config)
-endif ()
+run_cmake(install_config)
 run_cmake(incomplete-genex)
 run_cmake(export-NOWARN)
 

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

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx             |   13 ++-----------
 Tests/RunCMake/include_directories/RunCMakeTest.cmake |    6 +-----
 2 files changed, 3 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake