[libcxxabi] r235794 - libc++abi: remove build infrastructure for unwind

[Saleem Abdulrasool]

Author: compnerd
Date: Fri Apr 24 20:46:29 2015
New Revision: 235794

URL: http://llvm.org/viewvc/llvm-project?rev=235794&view=rev
Log:
libc++abi: remove build infrastructure for unwind

This removes the libunwind build infrastructure as libunwind is gaining its own
CMakeLists.txt.  The removal must occur first due to the multiple definitions of
the same target.

Modified:
    libcxxabi/trunk/CMakeLists.txt

Modified: libcxxabi/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=235794&r1=235793&r2=235794&view=diff
==============================================================================
--- libcxxabi/trunk/CMakeLists.txt (original)
+++ libcxxabi/trunk/CMakeLists.txt Fri Apr 24 20:46:29 2015
@@ -300,16 +300,14 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LI
 #===============================================================================
 
 include_directories(include)
-include_directories(../libunwind/include)
+if (LIBCXXABI_USE_LLVM_UNWINDER)
+  include_directories(${LLVM_MAIN_SRC_DIR}/projects/libunwind/include)
+endif ()
 
 # Add source code. This also contains all of the logic for deciding linker flags
 # soname, etc...
 add_subdirectory(src)
 
-if (LIBCXXABI_USE_LLVM_UNWINDER)
-  add_subdirectory(../libunwind/src "${CMAKE_CURRENT_BINARY_DIR}/libunwind")
-endif()
-
 if(NOT LIBCXXABI_ENABLE_SHARED)
   # TODO: Fix the libc++ cmake files so that libc++abi can be statically linked.
   # As it is now, libc++ will prefer linking against a dynamic libc++abi in the