summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2014-07-25 10:27:40 +0000
committerChandler Carruth <chandlerc@gmail.com>2014-07-25 10:27:40 +0000
commit168d0c1430fda855b1509fe00519b9b4128ab3a1 (patch)
tree8dae3a9af683bf21845f9ea8c671a8f45ebe834e /projects
parentc81927943719efbb8d9a305186e67adfb04d30aa (diff)
[cmake] Use the external project machinery for libcxxabi so that it can
be disabled in CMake or relocated if desired. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213936 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'projects')
-rw-r--r--projects/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index e23a2770562..8d244fd49ed 100644
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -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)