Skip to content

Commit 35de28c

Browse files
committed
See if our approach for removing /EHsc flag is excessive
1 parent b00e678 commit 35de28c

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

CMakeLists.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,10 @@ endif()
133133
foreach(NDEBUG_FLAG_STR IN ITEMS "/DNDEBUG" "/D NDEBUG" "-DNDEBUG")
134134
string(REPLACE "${NDEBUG_FLAG_STR}" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO
135135
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
136-
#if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
137-
# string(REPLACE "${NDEBUG_FLAG_STR}" "" CMAKE_CXX_FLAGS
138-
# "${CMAKE_CXX_FLAGS}")
139-
#endif()
140136
endforeach()
137+
string(STRIP "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" CMAKE_CXX_FLAGS_RELWITHDEBINFO)
141138
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
142139
CACHE STRING "Flags for RelWithDebInfo configuration." FORCE)
143-
#if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
144-
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}"
145-
# CACHE STRING "CMake C++ flags" FORCE)
146-
#endif()
147140

148141
if(HNSWLIB_EXAMPLES)
149142
message("Building examples and tests")
@@ -180,7 +173,7 @@ if(HNSWLIB_EXAMPLES)
180173
set(${FLAGS_VAR} "${${FLAGS_VAR}}" CACHE STRING
181174
"Flags for ${config} configuration." FORCE)
182175
endforeach()
183-
string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
176+
# string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
184177
endif()
185178
add_cxx_flags(/O2 /W1 /openmp)
186179
endif()

0 commit comments

Comments
 (0)