[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4008-g3ea4771

[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  3ea4771a5e564059385ffd9709a8e5dfc36736ae (commit)
       via  15d98a42fd2b7cadfdbc9268da3c79f389c5a3cc (commit)
      from  ce8a042ee106770ba957b60f12513208d7a52d3b (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=3ea4771a5e564059385ffd9709a8e5dfc36736ae
commit 3ea4771a5e564059385ffd9709a8e5dfc36736ae
Merge: ce8a042 15d98a4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 27 09:44:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 27 09:44:00 2013 -0400

    Merge topic 'fix-MAP_IMPORTED_CONFIG-evaluation' into next
    
    15d98a4 Genex: Fix evaluation of MAP_IMPORTED_CONFIG_<CONFIG>


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15d98a42fd2b7cadfdbc9268da3c79f389c5a3cc
commit 15d98a42fd2b7cadfdbc9268da3c79f389c5a3cc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 27 15:36:57 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 27 15:36:57 2013 +0200

    Genex: Fix evaluation of MAP_IMPORTED_CONFIG_<CONFIG>
    
    Commit 10a069b5 (Genex: Fix $<CONFIG> with IMPORTED targets and
    multiple locations., 2013-07-15) changed the logic here to include
    handling of the MAP_IMPORTED_CONFIG_<CONFIG> target property, but
    it was buggy in several ways.
    
    Uppercase the configs in all cases, and compare the mapped configs
    with the parameter to the CONFIG genex, instead of with the key of
    the mapping.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index e0c8c9e..abe4e70 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -574,14 +574,15 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
         // Check if there is a proper config mapping for the tested config.
         std::vector<std::string> mappedConfigs;
         std::string mapProp = "MAP_IMPORTED_CONFIG_";
-        mapProp += context->Config;
+        mapProp += cmSystemTools::UpperCase(context->Config);
         if(const char* mapValue =
                         context->CurrentTarget->GetProperty(mapProp.c_str()))
           {
           cmSystemTools::ExpandListArgument(cmSystemTools::UpperCase(mapValue),
                                             mappedConfigs);
           return std::find(mappedConfigs.begin(), mappedConfigs.end(),
-                          context->Config) != mappedConfigs.end() ? "1" : "0";
+                           cmSystemTools::UpperCase(parameters.front()))
+              != mappedConfigs.end() ? "1" : "0";
           }
         }
       }

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

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake