Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Allow disabling -Werror in CMake

Related to #1152
Commit
07c84adfbaac181560ed79576848fda82da6311b
Author
Martin Hořeňovský ·
Parents
8d854c689b7f

Files · Download .tar.gz

Changes

 CMakeLists.txt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fa91501..e0b2fc19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ project(CatchSelfTest)
 option(USE_VALGRIND "Perform SelfTests with Valgrind" OFF)
 option(BUILD_EXAMPLES "Build documentation examples" OFF)
 option(ENABLE_COVERAGE "Generate coverage for codecov.io" OFF)
+option(DISABLE_WERROR "Do not enable warnings as errors" OFF)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -309,7 +310,10 @@ if (NOT NO_SELFTEST)
 
     # Add desired warnings
     if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" )
-        target_compile_options( SelfTest PRIVATE -Wall -Wextra -Wunreachable-code -Werror )
+        target_compile_options( SelfTest PRIVATE -Wall -Wextra -Wunreachable-code )
+        if (NOT DISABLE_WERROR)
+            target_compile_options( SelfTest PRIVATE -Werror)
+        endif()
     endif()
     # Clang specific warning go here
     if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
@@ -318,7 +322,10 @@ if (NOT NO_SELFTEST)
     endif()
     if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
 		STRING(REGEX REPLACE "/W[0-9]" "/W4" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # override default warning level
-        target_compile_options( SelfTest PRIVATE /w44265 /WX /w44061 /w44062 )
+        target_compile_options( SelfTest PRIVATE /w44265 /w44061 /w44062 )
+        if (NOT DISABLE_WERROR)
+            target_compile_options( SelfTest PRIVATE /WX)
+        endif()
     endif()