From 8aa97fba9eb5d54d7141895c1db1ed8afe820d75 Mon Sep 17 00:00:00 2001
From: Benjamin Ballet <bballet@ivsweb.com>
Date: Wed, 20 Jul 2016 17:10:07 +0200
Subject: VS: Handle VS_GLOBAL_RootNamespace special case

Although we provide a `VS_GLOBAL_ROOTNAMESPACE` option to both set
the `RootNamespace` value and reference it, some users may try to
set `VS_GLOBAL_RootNamespace` to set `RootNamespace` as a variant
of the `VS_GLOBAL_<variable>` property.  In this case we still
need to add the reference to `$(RootNamespace)`.
---
 Source/cmVisualStudio10TargetGenerator.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 29459db..7624f78 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -531,7 +531,9 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
              this->Configurations.begin();
            i != this->Configurations.end(); ++i) {
         this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
-        if (this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE")) {
+        if (this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE") ||
+            // Handle variant of VS_GLOBAL_<variable> for RootNamespace.
+            this->GeneratorTarget->GetProperty("VS_GLOBAL_RootNamespace")) {
           (*this->BuildFileStream) << "$(RootNamespace).";
         }
         (*this->BuildFileStream) << "%(Filename)";
-- 
cgit v0.12