From da490d2ec1bb842e38d2cc49bd56aaccbb92c26e Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Fri, 25 Jul 2014 10:27:40 +0000 Subject: [PATCH] [cmake] Use the external project machinery for libcxxabi so that it can be disabled in CMake or relocated if desired. llvm-svn: 213936 --- llvm/projects/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/llvm/projects/CMakeLists.txt b/llvm/projects/CMakeLists.txt index e23a277..8d244fd 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) -- 2.7.4