File tree 1 file changed +9
-7
lines changed 1 file changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -81,11 +81,13 @@ CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/version.in"
81
81
NEWLINE_STYLE UNIX )
82
82
83
83
macro (UseCompilationWarningAsError)
84
- if ( MSVC )
85
- # Only enabled in debug because some old versions of VS STL generate
86
- # warnings when compiled in release configuration.
87
- set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /WX " )
88
- endif ()
84
+ if ( MSVC )
85
+ # Only enabled in debug because some old versions of VS STL generate
86
+ # warnings when compiled in release configuration.
87
+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /WX " )
88
+ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_XX_COMPILER_ID MATCHES "Clang" )
89
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
90
+ endif ()
89
91
endmacro ()
90
92
91
93
# Include our configuration header
@@ -99,10 +101,10 @@ endif()
99
101
100
102
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
101
103
# using regular Clang or AppleClang
102
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror - Wall -Wshadow -Wshorten-64-to-32" )
104
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wshadow -Wshorten-64-to-32" )
103
105
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
104
106
# using GCC
105
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror - Wall -Wshadow -Wextra -pedantic -Wno-long-long" )
107
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wshadow -Wextra -pedantic -Wno-long-long" )
106
108
# not yet ready for -Wsign-conversion
107
109
endif ()
108
110
You can’t perform that action at this time.
0 commit comments