summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-04-29 17:28:33 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-04-29 17:28:33 (GMT)
commit9d2e306e98cb2a6e644b668dd85914b2a1e0666c (patch)
tree68fcca1ceef6124e9faaa62d1e202b652cca292d /Source
parent43e21ce9237c8e1a10e8252bc446497ce94b5797 (diff)
parentce82e0a53f4064693c14ce97a5efb3e38efc3fa7 (diff)
downloadCMake-9d2e306e98cb2a6e644b668dd85914b2a1e0666c.zip
CMake-9d2e306e98cb2a6e644b668dd85914b2a1e0666c.tar.gz
CMake-9d2e306e98cb2a6e644b668dd85914b2a1e0666c.tar.bz2
Merge topic 'vs71-deprecate'
ce82e0a5 Deprecate Visual Studio 7 .NET 2003 generator 6a501b65 Tests: Drop test for VS 7.0 generator deprecation warnings
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalVisualStudio71Generator.cxx2
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx17
2 files changed, 18 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 7b51fdf..dd1f2e4 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -325,5 +325,5 @@ void cmGlobalVisualStudio71Generator
::GetDocumentation(cmDocumentationEntry& entry)
{
entry.Name = cmGlobalVisualStudio71Generator::GetActualName();
- entry.Brief = "Generates Visual Studio .NET 2003 project files.";
+ entry.Brief = "Deprecated. Generates Visual Studio .NET 2003 project files.";
}
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index c1c8c77..ba498ef 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -335,6 +335,23 @@ void cmGlobalVisualStudio7Generator::Generate()
{
this->CallVisualStudioMacro(MacroReload);
}
+
+ if (this->Version == VS71 &&
+ !this->CMakeInstance->GetIsInTryCompile())
+ {
+ const char* cmakeWarnVS71 =
+ this->CMakeInstance->GetState()->GetCacheEntryValue("CMAKE_WARN_VS71");
+ if (!cmakeWarnVS71 || !cmSystemTools::IsOff(cmakeWarnVS71))
+ {
+ this->CMakeInstance->IssueMessage(
+ cmake::WARNING,
+ "The \"Visual Studio 7 .NET 2003\" generator is deprecated "
+ "and will be removed in a future version of CMake."
+ "\n"
+ "Add CMAKE_WARN_VS71=OFF to the cache to disable this warning."
+ );
+ }
+ }
}
void cmGlobalVisualStudio7Generator