From 153dc48cd3d9db1baf121e0a093f81bf0e84ce1a Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Tue, 22 Jul 2014 15:41:33 +0000 Subject: [PATCH] Export LLVM_ENABLE_RTTI and LLVM_ENABLE_EH in LLVMConfig.cmake so clients of LLVM know if RTTI and/or EH were enabled in the build of LLVM they are trying to link against. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213664 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/modules/LLVMConfig.cmake.in | 4 ++++ cmake/modules/Makefile | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/cmake/modules/LLVMConfig.cmake.in b/cmake/modules/LLVMConfig.cmake.in index dca54845f34..7c314ac7c83 100644 --- a/cmake/modules/LLVMConfig.cmake.in +++ b/cmake/modules/LLVMConfig.cmake.in @@ -23,6 +23,10 @@ set(TARGET_TRIPLE "@TARGET_TRIPLE@") set(LLVM_ENABLE_ASSERTIONS @LLVM_ENABLE_ASSERTIONS@) +set(LLVM_ENABLE_EH @LLVM_ENABLE_EH@) + +set(LLVM_ENABLE_RTTI @LLVM_ENABLE_RTTI@) + set(LLVM_ENABLE_TERMINFO @LLVM_ENABLE_TERMINFO@) set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@) diff --git a/cmake/modules/Makefile b/cmake/modules/Makefile index b8fe20e7c61..33021bcbc9a 100644 --- a/cmake/modules/Makefile +++ b/cmake/modules/Makefile @@ -21,6 +21,18 @@ else LLVM_ENABLE_ASSERTIONS := 1 endif +ifeq ($(REQUIRES_EH),1) + LLVM_ENABLE_EH := 1 +else + LLVM_ENABLE_EH := 0 +endif + +ifeq ($(REQUIRES_RTTI),1) + LLVM_ENABLE_RTTI := 1 +else + LLVM_ENABLE_RTTI := 0 +endif + OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag) @@ -39,6 +51,8 @@ $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag) -e 's/@LLVM_TARGETS_WITH_JIT@/'"$(TARGETS_WITH_JIT)"'/' \ -e 's/@TARGET_TRIPLE@/'"$(TARGET_TRIPLE)"'/' \ -e 's/@LLVM_ENABLE_ASSERTIONS@/'"$(LLVM_ENABLE_ASSERTIONS)"'/' \ + -e 's/@LLVM_ENABLE_EH@/'"$(LLVM_ENABLE_EH)"'/' \ + -e 's/@LLVM_ENABLE_RTTI@/'"$(LLVM_ENABLE_RTTI)"'/' \ -e 's/@LLVM_ENABLE_TERMINFO@/'"$(ENABLE_TERMINFO)"'/' \ -e 's/@LLVM_ENABLE_THREADS@/'"$(ENABLE_THREADS)"'/' \ -e 's/@LLVM_ENABLE_ZLIB@/'"$(ENABLE_ZLIB)"'/' \