From 0f970f8cb204b7043fdc316bf43b1eab28c23d24 Mon Sep 17 00:00:00 2001 From: Andrey Bokhanko Date: Thu, 1 Sep 2016 14:39:54 +0000 Subject: [PATCH] [CMake] Fix LLVM_ENABLE_EH and LLVM_ENABLE_RTTI on MSVC Patch by Johannes Sebastian Mueller-Roemer. Differential Revision: https://reviews.llvm.org/D23645 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@280371 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/modules/AddLLVM.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 9590a1bee92..221d9bd9452 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -15,6 +15,9 @@ function(llvm_update_compile_flags name) 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 @@ function(llvm_update_compile_flags name) elseif (MSVC) list(APPEND LLVM_COMPILE_FLAGS "/GR-") endif () + elseif(MSVC) + list(APPEND LLVM_COMPILE_FLAGS "/GR") endif() # Assume that;