[Cmake-commits] CMake branch, next, updated. v3.7.0-1205-g76e1fe8

[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  76e1fe8b655674669cf23452291c59cae1d99f8e (commit)
       via  7c8f7737fd28d209cb871ac62bbd08ad738e2751 (commit)
      from  977d4b3fbb9eb109496c33a8093103a5b45cad4a (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=76e1fe8b655674669cf23452291c59cae1d99f8e
commit 76e1fe8b655674669cf23452291c59cae1d99f8e
Merge: 977d4b3 7c8f773
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 15 13:30:51 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 15 13:30:51 2016 -0500

    Merge topic 'vs-suppress-upgrade-prompt' into next
    
    7c8f7737 VS: Disable project upgrade prompt on VS 2013 and above


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c8f7737fd28d209cb871ac62bbd08ad738e2751
commit 7c8f7737fd28d209cb871ac62bbd08ad738e2751
Author:     Erik Christensen <christensen.erik at siemens.com>
AuthorDate: Mon Nov 14 17:38:29 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 15 10:40:55 2016 -0500

    VS: Disable project upgrade prompt on VS 2013 and above
    
    When opening projects in Visual Studio that specify an older toolset
    version, a prompt is displayed the first time asking the user whether to
    upgrade the projects.  This is meant for project files that are
    maintained manually and updated through the IDE.  For CMake-generated
    projects this does not make sense, so add content to tell VS not to
    upgrade.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 5dd9e48..4dabd51 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -314,6 +314,16 @@ void cmVisualStudio10TargetGenerator::Generate()
                              << "</TargetFrameworkVersion>\n";
   }
 
+  // Disable the project upgrade prompt that is displayed the first time a
+  // project using an older toolset version is opened in a newer version of
+  // the IDE (respected by VS 2013 and above).
+  if (this->GlobalGenerator->GetVersion() >=
+      cmGlobalVisualStudioGenerator::VS12) {
+    this->WriteString("<VCProjectUpgraderObjectName>NoUpgrade"
+                      "</VCProjectUpgraderObjectName>\n",
+                      2);
+  }
+
   std::vector<std::string> keys = this->GeneratorTarget->GetPropertyKeys();
   for (std::vector<std::string>::const_iterator keyIt = keys.begin();
        keyIt != keys.end(); ++keyIt) {

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)


hooks/post-receive
-- 
CMake