summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-08-04 13:15:08 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-08-04 13:15:08 (GMT)
commit4a1173fda09afe8fd861b45b77d83260cec688df (patch)
tree94c333734a9f6360436a86b28d3cc02d49222e45 /Source/cmake.cxx
parent331e791a3e18d8335960c0161d30dbe04e3a6fe5 (diff)
parent975426ceb339cf7a17f57ffba2757bb368669f93 (diff)
downloadCMake-4a1173fda09afe8fd861b45b77d83260cec688df.zip
CMake-4a1173fda09afe8fd861b45b77d83260cec688df.tar.gz
CMake-4a1173fda09afe8fd861b45b77d83260cec688df.tar.bz2
Merge topic 'cmake-W-options'
975426ce cmake: Do not treat developer warnings as errors by default in scripts
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r--Source/cmake.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index d4bca9a..8c455b2 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);