diff options
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | libcxxabi/test/CMakeLists.txt | 10 |
2 files changed, 16 insertions, 5 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index b8326d0..9064afb 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -131,10 +131,17 @@ if (NOT LIBCXXABI_ENABLE_SHARED AND NOT LIBCXXABI_ENABLE_STATIC) message(FATAL_ERROR "libc++abi must be built as either a shared or static library.") endif() -# TODO: Remove this, which shouldn't be necessary since we know we're being built -# side-by-side with libc++. set(LIBCXXABI_LIBCXX_INCLUDES "" CACHE PATH "Specify path to libc++ includes.") +if (NOT libcxx IN_LIST LLVM_ENABLE_RUNTIMES) + if (NOT IS_DIRECTORY ${LIBCXXABI_LIBCXX_INCLUDES}) + message(FATAL_ERROR + "LIBCXXABI_LIBCXX_INCLUDES=${LIBCXXABI_LIBCXX_INCLUDES} is not a valid directory. " + "Please provide the path to where the libc++ headers have been installed.") + endif() + add_library(cxx-headers INTERFACE) + target_include_directories(cxx-headers INTERFACE "${LIBCXXABI_LIBCXX_INCLUDES}") +endif() set(LIBCXXABI_HERMETIC_STATIC_LIBRARY_DEFAULT OFF) if (WIN32) diff --git a/libcxxabi/test/CMakeLists.txt b/libcxxabi/test/CMakeLists.txt index 0a4541b..0b82943 100644 --- a/libcxxabi/test/CMakeLists.txt +++ b/libcxxabi/test/CMakeLists.txt @@ -61,9 +61,13 @@ if (LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY) list(APPEND LIBCXXABI_TEST_DEPS cxx_external_threads) endif() -list(APPEND LIBCXXABI_TEST_DEPS cxx) -if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind) - list(APPEND LIBCXXABI_TEST_DEPS unwind) +if(libcxx IN_LIST LLVM_ENABLE_RUNTIMES) + list(APPEND LIBCXXABI_TEST_DEPS cxx) +endif() +if(libunwind IN_LIST LLVM_ENABLE_RUNTIMES) + if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind) + list(APPEND LIBCXXABI_TEST_DEPS unwind) + endif() endif() set(AUTO_GEN_COMMENT "## Autogenerated by libcxxabi configuration.\n# Do not edit!") |