Skip to content

Commit ffbec6f

Browse files
davidrohrdavidrohr
committed
Use CMAKE_C_WARNINGS and CMAKE_CXX_WARNINGS for all build types
1 parent 6f019ca commit ffbec6f

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

‎dependencies/O2CompileFlags.cmake‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,24 +87,27 @@ IF (NOT CMAKE_BUILD_TYPE)
8787
ENDIF (NOT CMAKE_BUILD_TYPE)
8888

8989
IF(ENABLE_CASSERT) #For the CI, we want to have <cassert> assertions enabled
90-
set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_WARNINGS}")
91-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${CMAKE_CXX_WARNINGS}")
90+
set(CMAKE_CXX_FLAGS_RELEASE "-O2")
91+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
9292
ELSE()
93-
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${CMAKE_CXX_WARNINGS}")
94-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${CMAKE_CXX_WARNINGS}")
93+
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
94+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")
9595
if (CMAKE_BUILD_TYPE STREQUAL "RELEASE" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
9696
set(FAIR_MIN_SEVERITY "info")
9797
endif()
9898
ENDIF()
99-
set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_WARNINGS}")
99+
set(CMAKE_C_FLAGS_RELEASE "-O2")
100100
set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
101-
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${CMAKE_C_WARNINGS}")
101+
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
102102
set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-O2 -g")
103103
# make sure Debug build not optimized (does not seem to work without CACHE + FORCE)
104-
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 ${CMAKE_CXX_WARNINGS}" CACHE STRING "Debug mode build flags" FORCE)
105-
set(CMAKE_C_FLAGS_DEBUG "-g -O0 ${CMAKE_C_WARNINGS}" CACHE STRING "Debug mode build flags" FORCE)
104+
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0" CACHE STRING "Debug mode build flags" FORCE)
105+
set(CMAKE_C_FLAGS_DEBUG "-g -O0" CACHE STRING "Debug mode build flags" FORCE)
106106
set(CMAKE_Fortran_FLAGS_DEBUG "-g -O0" CACHE STRING "Debug mode build flags" FORCE)
107107

108+
set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}} ${CMAKE_CXX_WARNINGS}")
109+
set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} ${CMAKE_C_WARNINGS}")
110+
108111
if(APPLE)
109112
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined,error") # avoid undefined in our libs
110113
elseif(UNIX)

0 commit comments

Comments
 (0)