Another attempt to get rid of -DNDEBUG

Author: michaelbautin

CMakeLists.txt

@@ -124,11 +124,6 @@ endif()
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     set(ENABLE_EXCEPTIONS_FLAGS /EHsc)
     set(DISABLE_EXCEPTIONS_FLAGS /GR- /D_HAS_EXCEPTIONS=0)
-    # 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)
@@ -138,8 +133,22 @@ else()
     string(REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS
            "${CMAKE_CXX_FLAGS}")
 endif()
+
+# Turn on assertions in the RelWithDebInfo build type.
+foreach(NDEBUG_FLAG_STR IN ITEMS "/D NDEBUG" "-DNDEBUG")
+    string(REPLACE "${NDEBUG_FLAG_STR}" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO
+           "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+        string(REPLACE "${NDEBUG_FLAG_STR}" "" CMAKE_CXX_FLAGS
+               "${CMAKE_CXX_FLAGS}")
+    endif()
+endforeach()
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO_NEW}"
     CACHE STRING "Flags for RelWithDebInfo configuration." FORCE)
+if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}"
+        CACHE STRING "CMake C++ flags" FORCE)
+endif()
 
 if(HNSWLIB_EXAMPLES)
     message("Building examples and tests")