Merge pull request #2546 from proydakov/msvc-noexcept-fix

Fixed msvc 2019 nmake noexcept build.
2021-02-24 12:02:07 -07:00 · 2021-02-24 12:02:07 -07:00 · 9801a9e42a
commit 9801a9e42a
parent 2e99822c14 5f7228e785
1 changed files with 3 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -193,6 +193,9 @@ elseif(MSVC)
    endif()
    if(ENABLE_EXCEPTIONS)
        add_compile_options(/EHsc) # Enable Exceptions
+	else()
+        string(REGEX REPLACE /EHsc "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Try to remove default /EHsc cxx_flag
+        add_compile_definitions(_HAS_EXCEPTIONS=0)
    endif()
 endif()