[llvm] r213936 - [cmake] Use the external project machinery for libcxxabi so that it can

[Chandler Carruth]

Author: chandlerc
Date: Fri Jul 25 05:27:40 2014
New Revision: 213936

URL: http://llvm.org/viewvc/llvm-project?rev=213936&view=rev
Log:
[cmake] Use the external project machinery for libcxxabi so that it can
be disabled in CMake or relocated if desired.

Modified:
    llvm/trunk/projects/CMakeLists.txt

Modified: llvm/trunk/projects/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/CMakeLists.txt?rev=213936&r1=213935&r2=213936&view=diff
==============================================================================
--- llvm/trunk/projects/CMakeLists.txt (original)
+++ llvm/trunk/projects/CMakeLists.txt Fri Jul 25 05:27:40 2014
@@ -6,7 +6,8 @@ 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))
       add_subdirectory(${entry})
     endif()
   endif()
@@ -19,6 +20,7 @@ if(${LLVM_BUILD_RUNTIME})
   # fixed.
   if(NOT MSVC)
     add_llvm_external_project(libcxx)
+    add_llvm_external_project(libcxxabi)
   endif()
   if(NOT LLVM_BUILD_EXTERNAL_COMPILER_RT)
     add_llvm_external_project(compiler-rt)