diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-24 13:36:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-24 13:36:10 (GMT) |
| commit | 096c3bacea33a3a1192d065d88f9bc6c995846ee (patch) | |
| tree | 437be328c3c811d0dd5ddca6163e496ac56aba4c /Source | |
| parent | 3ade7a306e0d002a6bfc89b20b7b1483643877ea (diff) | |
| parent | 81f9c9e892e6b4ee873361b3750a87760ebe8a2d (diff) | |
| download | CMake-096c3bacea33a3a1192d065d88f9bc6c995846ee.zip CMake-096c3bacea33a3a1192d065d88f9bc6c995846ee.tar.gz CMake-096c3bacea33a3a1192d065d88f9bc6c995846ee.tar.bz2 | |
Merge topic 'vs8-deprecate'
81f9c9e8 Deprecate Visual Studio 8 2005 generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !739
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 13 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio8Generator.cxx | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 14ec72f..1b75a08 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -293,6 +293,19 @@ void cmGlobalVisualStudio7Generator::Generate() if (!cmSystemTools::GetErrorOccuredFlag()) { this->CallVisualStudioMacro(MacroReload); } + + if (this->Version == VS8 && !this->CMakeInstance->GetIsInTryCompile()) { + const char* cmakeWarnVS8 = + this->CMakeInstance->GetState()->GetCacheEntryValue("CMAKE_WARN_VS8"); + if (!cmakeWarnVS8 || !cmSystemTools::IsOff(cmakeWarnVS8)) { + this->CMakeInstance->IssueMessage( + cmake::WARNING, + "The \"Visual Studio 8 2005\" generator is deprecated " + "and will be removed in a future version of CMake." + "\n" + "Add CMAKE_WARN_VS8=OFF to the cache to disable this warning."); + } + } } void cmGlobalVisualStudio7Generator::OutputSLNFile( diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 1fcb5ac..7a42b72 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -54,7 +54,7 @@ public: void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE { entry.Name = std::string(vs8generatorName) + " [arch]"; - entry.Brief = "Generates Visual Studio 2005 project files. " + entry.Brief = "Deprecated. Generates Visual Studio 2005 project files. " "Optional [arch] can be \"Win64\"."; } |