Disable -Werror by default

qgis · Sep 6, 2018 · 351eb57 · 351eb57
1 parent 80750ce
commit 351eb57
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh
@@ -56,7 +56,9 @@ cmake \
  -DWITH_SERVER=ON \
  -DDISABLE_DEPRECATED=ON \
  -DPYTHON_TEST_WRAPPER="timeout -sSIGSEGV 55s"\
- -DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" ..
+ -DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
+ -DWERROR=TRUE \
+ ..
 echo "travis_fold:end:cmake"
 
 #######

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -470,7 +470,11 @@ IF (PEDANTIC)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_warnings}")
   ELSE (MSVC)
     # add warnings via flags (not as definitions as on Mac -Wall can not be overridden per language )
-    SET(_warnings "-Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing -Werror")
+    SET(_warnings "-Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing")
+    SET(WERROR FALSE CACHE BOOL "Treat build warnings as errors.")
+    IF (WERROR)
+      SET(_warnings "${_warnings} -Werror")
+    ENDIF(WERROR)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_warnings}")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_warnings}")