[Cmake-commits] CMake branch, next, updated. v3.2.0-895-g0a15455

[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  0a15455b6d15150652cc57895ca0e927ff16b765 (commit)
       via  fa25e0d8506311e626efe062ab4d0978600a50c9 (commit)
       via  860c2761ded6d8133a028cdd1bbc567bbb74e486 (commit)
      from  325b8b652927c23b95bbc5fe1d8bdd0a139e32fd (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=0a15455b6d15150652cc57895ca0e927ff16b765
commit 0a15455b6d15150652cc57895ca0e927ff16b765
Merge: 325b8b6 fa25e0d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 7 07:29:11 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 7 07:29:11 2015 -0500

    Merge topic 'target-language-genex' into next
    
    fa25e0d8 Allow COMPILE_LANGUAGE with Watcom WMake.
    860c2761 Extract a variable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa25e0d8506311e626efe062ab4d0978600a50c9
commit fa25e0d8506311e626efe062ab4d0978600a50c9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 7 13:28:24 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 7 13:28:24 2015 +0100

    Allow COMPILE_LANGUAGE with Watcom WMake.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 9bfcbaa..756d932 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -863,7 +863,8 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
     else
       {
       if(genName.find("Makefiles") == std::string::npos &&
-              genName.find("Ninja") == std::string::npos)
+              genName.find("Ninja") == std::string::npos &&
+              genName.find("Watcom WMake") == std::string::npos)
         {
         reportError(context, content->GetOriginalExpression(),
             "$<COMPILE_LANGUAGE:...> not supported for this generator.");

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=860c2761ded6d8133a028cdd1bbc567bbb74e486
commit 860c2761ded6d8133a028cdd1bbc567bbb74e486
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 7 13:27:49 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 7 13:27:49 2015 +0100

    Extract a variable.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index f289ead..9bfcbaa 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -841,14 +841,15 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
       return std::string();
       }
 
-    if (gg->GetName().find("Visual Studio") != std::string::npos)
+    std::string genName = gg->GetName();
+    if (genName.find("Visual Studio") != std::string::npos)
       {
       reportError(context, content->GetOriginalExpression(),
           "$<COMPILE_LANGUAGE:...> may not be used with Visual Studio "
           "generators.");
       return std::string();
       }
-    else if (gg->GetName().find("Xcode") != std::string::npos)
+    else if (genName.find("Xcode") != std::string::npos)
       {
       if (dagChecker && (dagChecker->EvaluatingCompileDefinitions()
           || dagChecker->EvaluatingIncludeDirectories()))
@@ -861,8 +862,8 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
       }
     else
       {
-      if(gg->GetName().find("Makefiles") == std::string::npos &&
-              gg->GetName().find("Ninja") == std::string::npos)
+      if(genName.find("Makefiles") == std::string::npos &&
+              genName.find("Ninja") == std::string::npos)
         {
         reportError(context, content->GetOriginalExpression(),
             "$<COMPILE_LANGUAGE:...> not supported for this generator.");

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

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake