Skip to content

Commit 37b0592

Browse files
committed
cmake: Remove -D NDEBUG from CFLAGS as well as CXXFLAGS
This silences ~7 warnings on .c files in the LLVM build. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209163 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 2f8bca0 commit 37b0592

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

cmake/modules/HandleLLVMOptions.cmake

+10-7
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,16 @@ if( LLVM_ENABLE_ASSERTIONS )
5656
if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
5757
add_definitions( -UNDEBUG )
5858
# Also remove /D NDEBUG to avoid MSVC warnings about conflicting defines.
59-
set(REGEXP_NDEBUG "(^| )[/-]D *NDEBUG($| )")
60-
string (REGEX REPLACE "${REGEXP_NDEBUG}" " "
61-
CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
62-
string (REGEX REPLACE "${REGEXP_NDEBUG}" " "
63-
CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
64-
string (REGEX REPLACE "${REGEXP_NDEBUG}" " "
65-
CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
59+
foreach (flags_var_to_scrub
60+
CMAKE_CXX_FLAGS_RELEASE
61+
CMAKE_CXX_FLAGS_RELWITHDEBINFO
62+
CMAKE_CXX_FLAGS_MINSIZEREL
63+
CMAKE_C_FLAGS_RELEASE
64+
CMAKE_C_FLAGS_RELWITHDEBINFO
65+
CMAKE_C_FLAGS_MINSIZEREL)
66+
string (REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" " "
67+
"${flags_var_to_scrub}" "${${flags_var_to_scrub}}")
68+
endforeach()
6669
endif()
6770
else()
6871
if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" )

0 commit comments

Comments
 (0)