Additional replacements on CMAKE_CXX_FLAGS

Author: michaelbautin

CMakeLists.txt

@@ -81,6 +81,7 @@ function(add_example_or_test TARGET_NAME ...)
     endif()
 endfunction()
 
+
 option(HNSWLIB_ENABLE_EXCEPTIONS "Whether to enable exceptions in hnswlib" ON)
 if(HNSWLIB_ENABLE_EXCEPTIONS)
     message("Exceptions are enabled using HNSWLIB_ENABLE_EXCEPTIONS=ON (default)")
@@ -126,12 +127,16 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     # Turn on assertions in the RelWithDebInfo build type.
     string(REPLACE "/D NDEBUG" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO
            "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    string(REPLACE "/D NDEBUG" "" CMAKE_CXX_FLAGS
+           "${CMAKE_CXX_FLAGS}")
 else()
     set(ENABLE_EXCEPTIONS_FLAGS -fexceptions)
     set(DISABLE_EXCEPTIONS_FLAGS -fno-exceptions)
     # Turn on assertions in the RelWithDebInfo build type.
     string(REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO
            "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    string(REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS
+           "${CMAKE_CXX_FLAGS}")
 endif()
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO_NEW}"
     CACHE STRING "Flags for RelWithDebInfo configuration." FORCE)
@@ -171,6 +176,7 @@ if(HNSWLIB_EXAMPLES)
                 set(${FLAGS_VAR} "${${FLAGS_VAR}}" CACHE STRING
                     "Flags for ${config} configuration." FORCE)
             endforeach()
+            string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
         endif()
         add_cxx_flags(/O2 /W1 /openmp)
     endif()