summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-16 12:47:09 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-11-16 12:47:09 (GMT)
commit7849424173870379bde31903c0ee644e50f64582 (patch)
tree69116870b776fd4df6d32e1c7cf5dfac5478f825 /Source
parente1c410dea3f6062300d59c3343518013b53a18be (diff)
parent7c8f7737fd28d209cb871ac62bbd08ad738e2751 (diff)
downloadCMake-7849424173870379bde31903c0ee644e50f64582.zip
CMake-7849424173870379bde31903c0ee644e50f64582.tar.gz
CMake-7849424173870379bde31903c0ee644e50f64582.tar.bz2
Merge topic 'vs-suppress-upgrade-prompt'
7c8f7737 VS: Disable project upgrade prompt on VS 2013 and above
Diffstat (limited to 'Source')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx10
1 files changed, 10 insertions, 0 deletions
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) {