diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-16 13:58:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-16 13:58:45 (GMT) |
| commit | 5a45497fc116c75823103f77e7123b829669eff3 (patch) | |
| tree | cfbfb691875dcfeeeb37b45c6ca14c521f5e66ec /Source | |
| parent | 532644ea14135753d1b52b8883c7c6cd380b4dfa (diff) | |
| parent | 85c2626babf40d704f133fe49506d25f0a674b5f (diff) | |
| download | CMake-5a45497fc116c75823103f77e7123b829669eff3.zip CMake-5a45497fc116c75823103f77e7123b829669eff3.tar.gz CMake-5a45497fc116c75823103f77e7123b829669eff3.tar.bz2 | |
Merge topic 'vs6-deprecate'
85c2626b Deprecate Visual Studio 6 generator
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio6Generator.cxx | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index 62a308e..e2b2bbd4 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -185,6 +185,22 @@ void cmGlobalVisualStudio6Generator::Generate() // Now write out the DSW this->OutputDSWFile(); + + if (!this->CMakeInstance->GetIsInTryCompile()) + { + const char* cmakeWarnVS6 = + this->CMakeInstance->GetState()->GetCacheEntryValue("CMAKE_WARN_VS6"); + if (!cmakeWarnVS6 || !cmSystemTools::IsOff(cmakeWarnVS6)) + { + this->CMakeInstance->IssueMessage( + cmake::WARNING, + "The \"Visual Studio 6\" generator is deprecated " + "and will be removed in a future version of CMake." + "\n" + "Add CMAKE_WARN_VS6=OFF to the cache to disable this warning." + ); + } + } } // Write a DSW file to the stream @@ -411,7 +427,7 @@ void cmGlobalVisualStudio6Generator ::GetDocumentation(cmDocumentationEntry& entry) { entry.Name = cmGlobalVisualStudio6Generator::GetActualName(); - entry.Brief = "Generates Visual Studio 6 project files."; + entry.Brief = "Deprecated. Generates Visual Studio 6 project files."; } //---------------------------------------------------------------------------- |