[Cmake-commits] CMake branch, next, updated. v2.8.12-4230-g979831a

[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  979831aee6b68b8c9a39e1f70797637002dd8a73 (commit)
       via  0698714c86fdb187caf5df336fb7e3c005271872 (commit)
      from  ef9d8b9089d3d7f5519267c5fe13cfe21e874211 (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=979831aee6b68b8c9a39e1f70797637002dd8a73
commit 979831aee6b68b8c9a39e1f70797637002dd8a73
Merge: ef9d8b9 0698714
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 21 10:38:27 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 21 10:38:27 2013 -0400

    Merge topic 'vs9-target-framework-version' into next
    
    0698714 VS: Set .NET target framework version for VS 7-9 (#14499)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0698714c86fdb187caf5df336fb7e3c005271872
commit 0698714c86fdb187caf5df336fb7e3c005271872
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 21 09:35:09 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 21 09:35:09 2013 -0400

    VS: Set .NET target framework version for VS 7-9 (#14499)
    
    Teach the VS 7-9 generators to honor the
    
     VS_DOTNET_TARGET_FRAMEWORK_VERSION
    
    target property.  This was already done for VS >= 10 by commit cfe6300a
    (VS: Add support for .NET target framework version, 2013-06-14).
    
    Inspired-by: mar.na at t-online.de

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index f21abc3..30c3d73 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2050,6 +2050,11 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     fout << "\tProjectGUID=\"{" << gg->GetGUID(libName) << "}\"\n";
     }
   this->WriteProjectSCC(fout, target);
+  if(const char* targetFrameworkVersion =
+     target.GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
+    {
+    fout << "\tTargetFrameworkVersion=\"" << targetFrameworkVersion << "\"\n";
+    }
   fout << "\tKeyword=\"" << keyword << "\">\n"
        << "\t<Platforms>\n"
        << "\t\t<Platform\n\t\t\tName=\"" << this->PlatformName << "\"/>\n"

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake