From f4d9466130c28d4d9f24885f9183a95ee115bb3c Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sun, 15 Dec 2013 11:02:56 +0100
Subject: Genex: Accept arbitrary content in *_CASE and MAKE_C_IDENTIFIER.

---
 Source/cmGeneratorExpressionEvaluator.cxx   | 6 ++++++
 Tests/GeneratorExpression/CMakeLists.txt    | 6 +++---
 Tests/GeneratorExpression/check-part3.cmake | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 34d4434..c1d1086 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -201,6 +201,8 @@ static const struct LowerCaseNode : public cmGeneratorExpressionNode
 {
   LowerCaseNode() {}
 
+  bool AcceptsArbitraryContentParameter() const { return true; }
+
   std::string Evaluate(const std::vector<std::string> &parameters,
                        cmGeneratorExpressionContext *,
                        const GeneratorExpressionContent *,
@@ -215,6 +217,8 @@ static const struct UpperCaseNode : public cmGeneratorExpressionNode
 {
   UpperCaseNode() {}
 
+  bool AcceptsArbitraryContentParameter() const { return true; }
+
   std::string Evaluate(const std::vector<std::string> &parameters,
                        cmGeneratorExpressionContext *,
                        const GeneratorExpressionContent *,
@@ -229,6 +233,8 @@ static const struct MakeCIdentifierNode : public cmGeneratorExpressionNode
 {
   MakeCIdentifierNode() {}
 
+  bool AcceptsArbitraryContentParameter() const { return true; }
+
   std::string Evaluate(const std::vector<std::string> &parameters,
                        cmGeneratorExpressionContext *,
                        const GeneratorExpressionContent *,
diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index edadb87..892f80f 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -193,9 +193,9 @@ add_custom_target(check-part3 ALL
     -Dtest_platform_id_Linux=$<PLATFORM_ID:Linux>
     -Dtest_platform_id_Windows=$<PLATFORM_ID:Windows>
     -Dtest_platform_id_Darwin=$<PLATFORM_ID:Darwin>
-    -Dlower_case=$<LOWER_CASE:MiXeD>
-    -Dupper_case=$<UPPER_CASE:MiXeD>
-    -Dmake_c_identifier=$<MAKE_C_IDENTIFIER:4foo:+bar-$>
+    -Dlower_case=$<LOWER_CASE:Mi,XeD>
+    -Dupper_case=$<UPPER_CASE:MiX,eD>
+    -Dmake_c_identifier=$<MAKE_C_IDENTIFIER:4f,oo:+bar-$>
     -P ${CMAKE_CURRENT_SOURCE_DIR}/check-part3.cmake
   COMMAND ${CMAKE_COMMAND} -E echo "check done (part 3 of 3)"
   VERBATIM
diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index a86db31..3361eeb 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -34,6 +34,6 @@ foreach(system Linux Windows Darwin)
     check(test_platform_id_${system} 0)
   endif()
 endforeach()
-check(lower_case "mixed")
-check(upper_case "MIXED")
-check(make_c_identifier "_4foo__bar__")
+check(lower_case "mi,xed")
+check(upper_case "MIX,ED")
+check(make_c_identifier "_4f_oo__bar__")
-- 
cgit v0.12