[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2619-gc043669

[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  c0436698786f2c196ed2849a6904d269b51db5f9 (commit)
       via  cfe6300a41392b79d95774c2778d33a55deaed48 (commit)
       via  82771f186220b45a9aaf10ed416f1df135e56c36 (commit)
      from  349ce8462282c2036b427aa3d790ff97955c861f (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=c0436698786f2c196ed2849a6904d269b51db5f9
commit c0436698786f2c196ed2849a6904d269b51db5f9
Merge: 349ce84 cfe6300
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 14 08:15:55 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 14 08:15:55 2013 -0400

    Merge topic 'vs-TargetFrameworkVersion' into next
    
    cfe6300 VS: Add support for .NET target framework version
    82771f1 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfe6300a41392b79d95774c2778d33a55deaed48
commit cfe6300a41392b79d95774c2778d33a55deaed48
Author:     Christian Maaser <christian.maaser at thalesgroup.com>
AuthorDate: Fri Jun 14 07:28:00 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 14 08:09:00 2013 -0400

    VS: Add support for .NET target framework version
    
    Teach CMake to generate the TargetFrameworkVersion XML node as
    documented at
    
     http://msdn.microsoft.com/en-us/library/vstudio/ff770576.aspx
    
    from target property VS_DOTNET_TARGET_FRAMEWORK_VERSION.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7d25b91..b14db43 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1403,6 +1403,11 @@ void cmTarget::DefineProperties(cmake *cm)
      "Sets the \"RootNamespace\" attribute for a generated Visual Studio "
      "project.  The attribute will be generated only if this is set.");
   cm->DefineProperty
+    ("VS_DOTNET_TARGET_FRAMEWORK_VERSION", cmProperty::TARGET,
+     "Specify the .NET target framework version.",
+     "Used to specify the .NET target framework version for C++/CLI. "
+     "For example, \"v4.5\".");
+  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 f8de3a8..2c9ec8e 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -280,6 +280,13 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
   this->WriteString("<ProjectName>", 2);
   (*this->BuildFileStream) << projLabel << "</ProjectName>\n";
+  if(const char* targetFrameworkVersion = this->Target->GetProperty(
+       "VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
+    {
+    this->WriteString("<TargetFrameworkVersion>", 2);
+    (*this->BuildFileStream) << targetFrameworkVersion
+                             << "</TargetFrameworkVersion>\n";
+    }
   this->WriteString("</PropertyGroup>\n", 1);
   this->WriteString("<Import Project="
                     "\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />\n",

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

Summary of changes:
 Source/CMakeVersion.cmake                  |    2 +-
 Source/cmTarget.cxx                        |    5 +++++
 Source/cmVisualStudio10TargetGenerator.cxx |    7 +++++++
 3 files changed, 13 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake