Merging r213664:

------------------------------------------------------------------------
r213664 | delcypher | 2014-07-22 16:41:33 +0100 (Tue, 22 Jul 2014) | 3 lines

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/branches/release_35@213765 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/cmake/modules/LLVMConfig.cmake.in b/cmake/modules/LLVMConfig.cmake.in
index dca54845f3405e50c15914c42448bb04f5b922eb..7c314ac7c833a259d43af5740a07d92d69ea1c74 100644 (file)
--- 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 b8fe20e7c619e7d9ae1f498e9324db24e5d64299..33021bcbc9ae94f44477d7348ccebf6f8e85c2b2 100644 (file)
--- 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)"'/' \