|
 |
1d4832d |
commit 07c84adfbaac181560ed79576848fda82da6311b
|
|
|
1d4832d |
Author: Martin Hořeňovský <martin.horenovsky@gmail.com>
|
|
|
1d4832d |
Date: Sun Jan 14 18:14:11 2018 +0100
|
|
|
1d4832d |
|
|
|
1d4832d |
Allow disabling -Werror in CMake
|
|
|
1d4832d |
|
|
|
1d4832d |
Related to #1152
|
|
|
1d4832d |
|
|
|
1d4832d |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
1d4832d |
index 0fa91501..e0b2fc19 100644
|
|
|
1d4832d |
--- a/CMakeLists.txt
|
|
|
1d4832d |
+++ b/CMakeLists.txt
|
|
|
1d4832d |
@@ -5,6 +5,7 @@ project(CatchSelfTest)
|
|
|
1d4832d |
option(USE_VALGRIND "Perform SelfTests with Valgrind" OFF)
|
|
|
1d4832d |
option(BUILD_EXAMPLES "Build documentation examples" OFF)
|
|
|
1d4832d |
option(ENABLE_COVERAGE "Generate coverage for codecov.io" OFF)
|
|
|
1d4832d |
+option(DISABLE_WERROR "Do not enable warnings as errors" OFF)
|
|
|
1d4832d |
|
|
|
1d4832d |
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
|
|
1d4832d |
|
|
|
1d4832d |
@@ -309,7 +310,10 @@ if (NOT NO_SELFTEST)
|
|
|
1d4832d |
|
|
|
1d4832d |
# Add desired warnings
|
|
|
1d4832d |
if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" )
|
|
|
1d4832d |
- target_compile_options( SelfTest PRIVATE -Wall -Wextra -Wunreachable-code -Werror )
|
|
|
1d4832d |
+ target_compile_options( SelfTest PRIVATE -Wall -Wextra -Wunreachable-code )
|
|
|
1d4832d |
+ if (NOT DISABLE_WERROR)
|
|
|
1d4832d |
+ target_compile_options( SelfTest PRIVATE -Werror)
|
|
|
1d4832d |
+ endif()
|
|
|
1d4832d |
endif()
|
|
|
1d4832d |
# Clang specific warning go here
|
|
|
1d4832d |
if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
|
|
|
1d4832d |
@@ -318,7 +322,10 @@ if (NOT NO_SELFTEST)
|
|
|
1d4832d |
endif()
|
|
|
1d4832d |
if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
|
|
|
1d4832d |
STRING(REGEX REPLACE "/W[0-9]" "/W4" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # override default warning level
|
|
|
1d4832d |
- target_compile_options( SelfTest PRIVATE /w44265 /WX /w44061 /w44062 )
|
|
|
1d4832d |
+ target_compile_options( SelfTest PRIVATE /w44265 /w44061 /w44062 )
|
|
|
1d4832d |
+ if (NOT DISABLE_WERROR)
|
|
|
1d4832d |
+ target_compile_options( SelfTest PRIVATE /WX)
|
|
|
1d4832d |
+ endif()
|
|
|
1d4832d |
endif()
|
|
|
1d4832d |
|
|
|
1d4832d |
|