From 975426ceb339cf7a17f57ffba2757bb368669f93 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 3 Aug 2015 10:00:42 -0400 Subject: cmake: Do not treat developer warnings as errors by default in scripts The logic in commit c96fe0b4 (cmake: Add -W options to control deprecation warnings and errors, 2015-07-28) accidentally enables errors on warnings by default in scripts because there is no initialization of CMAKE_SUPPRESS_DEVELOPER_ERRORS to TRUE. Rename internal CMAKE_SUPPRESS_DEVELOPER_ERRORS cache entry to CMAKE_ERROR_DEVELOPER_WARNINGS. Fix the logic in the message() command to treat AUTHOR_WARNING as an error only if the option is explicitly enabled. --- Source/cmMessageCommand.cxx | 2 +- Source/cmake.cxx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx index e09ba75..467555f 100644 --- a/Source/cmMessageCommand.cxx +++ b/Source/cmMessageCommand.cxx @@ -43,7 +43,7 @@ bool cmMessageCommand } else if (*i == "AUTHOR_WARNING") { - if (!this->Makefile->IsOn("CMAKE_SUPPRESS_DEVELOPER_ERRORS")) + if (this->Makefile->IsOn("CMAKE_ERROR_DEVELOPER_WARNINGS")) { fatal = true; type = cmake::AUTHOR_ERROR; diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 6832141..e28f385 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1289,7 +1289,7 @@ int cmake::Configure() " the author of the CMakeLists.txt files.", cmState::INTERNAL); this->CacheManager-> - AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_ERRORS", "TRUE", + AddCacheEntry("CMAKE_ERROR_DEVELOPER_WARNINGS", "FALSE", "Suppress errors that are meant for" " the author of the CMakeLists.txt files.", cmState::INTERNAL); @@ -1328,7 +1328,7 @@ int cmake::Configure() else if (warningLevel == ERROR_LEVEL) { this->CacheManager-> - AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_ERRORS", "FALSE", + AddCacheEntry("CMAKE_ERROR_DEVELOPER_WARNINGS", "TRUE", "Suppress errors that are meant for" " the author of the CMakeLists.txt files.", cmState::INTERNAL); @@ -1676,11 +1676,11 @@ int cmake::Run(const std::vector& args, bool noconfigure) } // don't turn dev warnings into errors by default, if no value has been - // specified for the flag, enable it - if (!this->State->GetCacheEntryValue("CMAKE_SUPPRESS_DEVELOPER_ERRORS")) + // specified for the flag, disable it + if (!this->State->GetCacheEntryValue("CMAKE_ERROR_DEVELOPER_WARNINGS")) { this->CacheManager-> - AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_ERRORS", "TRUE", + AddCacheEntry("CMAKE_ERROR_DEVELOPER_WARNINGS", "FALSE", "Suppress errors that are meant for" " the author of the CMakeLists.txt files.", cmState::INTERNAL); -- cgit v0.12