diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-03 14:00:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-08-03 14:03:27 (GMT) |
| commit | 975426ceb339cf7a17f57ffba2757bb368669f93 (patch) | |
| tree | 32730e00c4ff553a74f5d7598b07e95877657602 | |
| parent | c96fe0b40d562b65831376f927b6fd96cf999a52 (diff) | |
| download | CMake-975426ceb339cf7a17f57ffba2757bb368669f93.zip CMake-975426ceb339cf7a17f57ffba2757bb368669f93.tar.gz CMake-975426ceb339cf7a17f57ffba2757bb368669f93.tar.bz2 | |
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.
| -rw-r--r-- | Source/cmMessageCommand.cxx | 2 | ||||
| -rw-r--r-- | 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<std::string>& 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); |