X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=projects%2FCMakeLists.txt;h=d3b2fc37af799e777f1a49275369d84990a2b87a;hb=4362ca6c771eebef5a79e6e95d47c6592a8561c9;hp=67943c2e9a36460fa0b14ccbb4caa6dad7ec8cc2;hpb=56d34914b2351d9ba7951a0325ca7908617d5699;p=oota-llvm.git

diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index 67943c2e9a3..d3b2fc37af7 100644
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -6,7 +6,9 @@ foreach(entry ${entries})
   if(IS_DIRECTORY ${entry} AND EXISTS ${entry}/CMakeLists.txt)
     if((NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt) AND
        (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/dragonegg) AND
-       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxx))
+       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxx) AND
+       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxxabi) AND
+       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libunwind))
       add_subdirectory(${entry})
     endif()
   endif()
@@ -18,9 +20,15 @@ if(${LLVM_BUILD_RUNTIME})
   # MSVC isn't quite working with libc++ yet, disable it until issues are
   # fixed.
   if(NOT MSVC)
+    # libc++ uses the libc++abi target names so libc++abi should be added
+    # first.
+    add_llvm_external_project(libcxxabi)
     add_llvm_external_project(libcxx)
+    add_llvm_external_project(libunwind)
+  endif()
+  if(NOT LLVM_BUILD_EXTERNAL_COMPILER_RT)
+    add_llvm_external_project(compiler-rt)
   endif()
-  add_llvm_external_project(compiler-rt)
 endif()
 
 add_llvm_external_project(dragonegg)