Iterating on NDEBUG

Author: michaelbautin

CMakeLists.txt

@@ -127,30 +127,23 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 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()
 
 # Turn on assertions in the RelWithDebInfo build type.
 foreach(NDEBUG_FLAG_STR IN ITEMS "/DNDEBUG" "/D NDEBUG" "-DNDEBUG")
     string(REPLACE "${NDEBUG_FLAG_STR}" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO
            "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-    # TODO: this should not be necessary.
-    string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -UNDEBUG")
-    if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-        string(REPLACE "${NDEBUG_FLAG_STR}" "" CMAKE_CXX_FLAGS
-               "${CMAKE_CXX_FLAGS}")
-    endif()
+    #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}"
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
     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(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")

examples/cpp/example_search.cpp

@@ -54,10 +54,5 @@ int main() {
 
     delete[] data;
     delete alg_hnsw;
-#ifdef _MSC_VER
-    // Remove this once we make sure that assertions work correctly in MSVC
-    // RelWithDebInfo builds.
-    assert(false);
-#endif    
     return 0;
 }