[llvm-branch-commits] [llvm-branch] r213765 - Merging r213664:

[Dan Liew]

Author: delcypher
Date: Wed Jul 23 10:20:44 2014
New Revision: 213765

URL: http://llvm.org/viewvc/llvm-project?rev=213765&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_35/cmake/modules/LLVMConfig.cmake.in
    llvm/branches/release_35/cmake/modules/Makefile

Modified: llvm/branches/release_35/cmake/modules/LLVMConfig.cmake.in
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/cmake/modules/LLVMConfig.cmake.in?rev=213765&r1=213764&r2=213765&view=diff
==============================================================================
--- llvm/branches/release_35/cmake/modules/LLVMConfig.cmake.in (original)
+++ llvm/branches/release_35/cmake/modules/LLVMConfig.cmake.in Wed Jul 23 10:20:44 2014
@@ -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@)

Modified: llvm/branches/release_35/cmake/modules/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/cmake/modules/Makefile?rev=213765&r1=213764&r2=213765&view=diff
==============================================================================
--- llvm/branches/release_35/cmake/modules/Makefile (original)
+++ llvm/branches/release_35/cmake/modules/Makefile Wed Jul 23 10:20:44 2014
@@ -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: LLVMCo
 	  -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)"'/' \