[PATCH] D23645: [CMake] Fix LLVM_ENABLE_EH and LLVM_ENABLE_RTTI on MSVC

[Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL280371: [CMake] Fix LLVM_ENABLE_EH and LLVM_ENABLE_RTTI on MSVC (authored by asbokhan).

Changed prior to commit:
  https://reviews.llvm.org/D23645?vs=68483&id=70011#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D23645

Files:
  llvm/trunk/cmake/modules/AddLLVM.cmake

Index: llvm/trunk/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake
+++ llvm/trunk/cmake/modules/AddLLVM.cmake
@@ -15,6 +15,9 @@
       message(AUTHOR_WARNING "Exception handling requires RTTI. Enabling RTTI for ${name}")
       set(LLVM_REQUIRES_RTTI ON)
     endif()
+    if(MSVC)
+      list(APPEND LLVM_COMPILE_FLAGS "/EHsc")
+    endif()
   else()
     if(LLVM_COMPILER_IS_GCC_COMPATIBLE)
       list(APPEND LLVM_COMPILE_FLAGS "-fno-exceptions")
@@ -35,6 +38,8 @@
     elseif (MSVC)
       list(APPEND LLVM_COMPILE_FLAGS "/GR-")
     endif ()
+  elseif(MSVC)
+    list(APPEND LLVM_COMPILE_FLAGS "/GR")
   endif()
 
   # Assume that;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23645.70011.patch
Type: text/x-patch
Size: 727 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160901/3c351230/attachment.bin>