diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio71Generator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 17 | ||||
| -rw-r--r-- | Source/cmcmd.cxx | 6 |
4 files changed, 23 insertions, 4 deletions
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 489dc3c..b83cb17 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 5) -set(CMake_VERSION_PATCH 20160428) +set(CMake_VERSION_PATCH 20160502) #set(CMake_VERSION_RC 1) diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index bf59925..0ca4db1 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -327,5 +327,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 f8fe074..058183c 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -338,6 +338,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 diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 1f92b67..22c6a06 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -383,12 +383,14 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) if (!tidy.empty()) { // Construct the clang-tidy command line by taking what was given - // and adding all the arguments we give to the compiler. + // and adding our compiler command line. The clang-tidy tool will + // automatically skip over the compiler itself and extract the + // options. std::vector<std::string> tidy_cmd; cmSystemTools::ExpandListArgument(tidy, tidy_cmd, true); tidy_cmd.push_back(sourceFile); tidy_cmd.push_back("--"); - tidy_cmd.insert(tidy_cmd.end(), orig_cmd.begin()+1, orig_cmd.end()); + tidy_cmd.insert(tidy_cmd.end(), orig_cmd.begin(), orig_cmd.end()); // Run the tidy command line. Capture its stdout and hide its stderr. std::string stdOut; |