From 354face4fa234adfe6f056dc9d3039fc135ab4ef Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Thu, 4 Oct 2012 00:36:23 +0200
Subject: GenEx: Ensure that the empty CONFIGURATION can be used conditionally.

The CONFIGURATION can not be manipulated at unit testing time, so
this is not unit tested further.
---
 Source/cmGeneratorExpressionEvaluator.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 12809f4..93895b3 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -237,11 +237,6 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
                        const GeneratorExpressionContent *content,
                        cmGeneratorExpressionDAGChecker *) const
   {
-    if (!context->Config)
-      {
-      return std::string();
-      }
-
     cmsys::RegularExpression configValidator;
     configValidator.compile("^[A-Za-z0-9_]*$");
     if (!configValidator.find(parameters.begin()->c_str()))
@@ -250,6 +245,11 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
                   "Expression syntax not recognized.");
       return std::string();
       }
+    if (!context->Config)
+      {
+      return parameters.front().empty() ? "1" : "0";
+      }
+
     return *parameters.begin() == context->Config ? "1" : "0";
   }
 } configurationTestNode;
-- 
cgit v0.12