Merge pull request #2285 from proydakov/msvc-rtti-compilation-warning-fix

Fixed msvc 2019 nmake compiler warnings with RTTI.

Merge pull request #2285 from proydakov/msvc-rtti-compilation-warning-fix
fbb9dc2c · John Kessenich · GitHub · 83970445 · b90adef9 · fbb9dc2c
Unverified Commit fbb9dc2c authored Jun 24, 2020 by John Kessenich Committed by GitHub Jun 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

CMakeLists.txt CMakeLists.txt +6 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,12 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" AND NOT MSVC)
    endif()
 elseif(MSVC)
    if(NOT ENABLE_RTTI)
-        add_compile_options(/GR-) # Disable RTTI
+        string(FIND "${CMAKE_CXX_FLAGS}" "/GR" MSVC_HAS_GR)
+        if(MSVC_HAS_GR)
+            string(REGEX REPLACE /GR /GR- CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+        else()
+            add_compile_options(/GR-) # Disable RTTI
+        endif()
    endif()
    if(ENABLE_EXCEPTIONS)
        add_compile_options(/EHsc) # Enable Exceptions