[Cmake-commits] CMake branch, next, updated. v3.6.0-927-g91ec400

[Brad King]

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  91ec400aec135c60e6d22b6c17405a88cc352de9 (commit)
       via  8aa97fba9eb5d54d7141895c1db1ed8afe820d75 (commit)
      from  d2a5bf08e9c46931b79307ed616c8ac4a61ae09d (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91ec400aec135c60e6d22b6c17405a88cc352de9
commit 91ec400aec135c60e6d22b6c17405a88cc352de9
Merge: d2a5bf0 8aa97fb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 20 11:40:16 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 20 11:40:16 2016 -0400

    Merge topic 'vs-alternate-RootNamespace' into next
    
    8aa97fba VS: Handle VS_GLOBAL_RootNamespace special case


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8aa97fba9eb5d54d7141895c1db1ed8afe820d75
commit 8aa97fba9eb5d54d7141895c1db1ed8afe820d75
Author:     Benjamin Ballet <bballet at ivsweb.com>
AuthorDate: Wed Jul 20 17:10:07 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 20 11:34:47 2016 -0400

    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)`.

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)";

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake