summaryrefslogtreecommitdiffstats
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
commitda490d2ec1bb842e38d2cc49bd56aaccbb92c26e (patch)
tree2f8bad0f805f44c6e8214843c1a4c5252945c1ea
parent8a157bf8f2117371bd9317b3eaf38956afe88781 (diff)
downloadbcm5719-llvm-da490d2ec1bb842e38d2cc49bd56aaccbb92c26e.tar.gz
bcm5719-llvm-da490d2ec1bb842e38d2cc49bd56aaccbb92c26e.zip
[cmake] Use the external project machinery for libcxxabi so that it can
be disabled in CMake or relocated if desired. llvm-svn: 213936
-rw-r--r--llvm/projects/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/projects/CMakeLists.txt b/llvm/projects/CMakeLists.txt
index e23a2770562..8d244fd49ed 100644
--- a/llvm/projects/CMakeLists.txt
+++ b/llvm/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)
OpenPOWER on IntegriCloud