[Cmake-commits] CMake branch, next, updated. v2.8.11-2378-ge554e6c

[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  e554e6c415a7030cbadb263004d07ba1bfb5d5bc (commit)
       via  cca955a27cf3fc8344ee3dce213472b61e1edef7 (commit)
      from  42f3e8e18d7e8077e2ec37f8edcff20a1dd295fd (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=e554e6c415a7030cbadb263004d07ba1bfb5d5bc
commit e554e6c415a7030cbadb263004d07ba1bfb5d5bc
Merge: 42f3e8e cca955a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 31 09:21:29 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 31 09:21:29 2013 -0400

    Merge topic 'vs-RootNamespace' into next
    
    cca955a VS: Add VS_GLOBAL_ROOTNAMESPACE target property


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cca955a27cf3fc8344ee3dce213472b61e1edef7
commit cca955a27cf3fc8344ee3dce213472b61e1edef7
Author:     John Farrier <john.farrier at digitalinblue.com>
AuthorDate: Wed May 29 20:16:36 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 31 09:15:30 2013 -0400

    VS: Add VS_GLOBAL_ROOTNAMESPACE target property
    
    Add a setting for Visual Studio projects for the root namespace in the
    "Globals" PropertyGroup section of the project file.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 66c22b1..40c9798 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1303,6 +1303,11 @@ void cmTarget::DefineProperties(cmake *cm)
      "this value with \"ManagedCProj\", for example, in a Visual "
      "Studio managed C++ unit test project.");
   cm->DefineProperty
+    ("VS_GLOBAL_ROOTNAMESPACE", cmProperty::TARGET,
+     "Visual Studio project root namespace.",
+     "Sets the \"RootNamespace\" attribute for a generated Visual Studio "
+     "project.  The attribute will be generated only if this is set.");
+  cm->DefineProperty
     ("VS_DOTNET_REFERENCES", cmProperty::TARGET,
      "Visual Studio managed project .NET references",
      "Adds one or more semicolon-delimited .NET references to a "
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 933bf95..61a3427 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -262,6 +262,15 @@ void cmVisualStudio10TargetGenerator::Generate()
       "</Keyword>\n";
     }
 
+  const char* vsGlobalRootNamespace =
+    this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
+  if(vsGlobalRootNamespace)
+    {
+    this->WriteString("<RootNamespace>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(vsGlobalRootNamespace) <<
+      "</RootNamespace>\n";
+    }
+
   this->WriteString("<Platform>", 2);
   (*this->BuildFileStream) << this->Platform << "</Platform>\n";
   const char* projLabel = this->Target->GetProperty("PROJECT_LABEL");

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

Summary of changes:
 Source/cmTarget.cxx                        |    5 +++++
 Source/cmVisualStudio10TargetGenerator.cxx |    9 +++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake