diff options
| author | Petr Hosek <phosek@chromium.org> | 2016-11-09 03:22:28 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2016-11-09 03:22:28 +0000 |
| commit | 260952ed1a9f9b9aa3b009f6c1f45bae742c2dbe (patch) | |
| tree | 0aaff5b97bf3a433e077bd266a576b224bf63432 | |
| parent | b346e3e527603e124296b2a8a5d8ad9f6546fd04 (diff) | |
| download | llvm-260952ed1a9f9b9aa3b009f6c1f45bae742c2dbe.zip llvm-260952ed1a9f9b9aa3b009f6c1f45bae742c2dbe.tar.gz llvm-260952ed1a9f9b9aa3b009f6c1f45bae742c2dbe.tar.bz2 | |
[CMake] Check runtimes subdir when looking for libcxxabi
The runtimes subdir is the new location for runtimes, we should
include it when looking for libcxxabi headers.
Differential Revision: https://reviews.llvm.org/D26363
llvm-svn: 286333
| -rw-r--r-- | libcxx/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index b29d6c8..94a682c 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -101,10 +101,17 @@ set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS}) # Setup the default options if LIBCXX_CXX_ABI is not specified. if (NOT LIBCXX_CXX_ABI) + find_path( + LIBCXX_LIBCXXABI_INCLUDES_INTERNAL + cxxabi.h + PATHS ${LLVM_MAIN_SRC_DIR}/projects/libcxxabi/include + ${LLVM_MAIN_SRC_DIR}/runtimes/libcxxabi/include + NO_DEFAULT_PATH + ) if (NOT DEFINED LIBCXX_STANDALONE_BUILD AND - IS_DIRECTORY "${CMAKE_SOURCE_DIR}/projects/libcxxabi") + IS_DIRECTORY "${LIBCXX_LIBCXXABI_INCLUDES_INTERNAL}") set(LIBCXX_CXX_ABI_LIBNAME "libcxxabi") - set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${CMAKE_SOURCE_DIR}/projects/libcxxabi/include") + set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${LIBCXX_LIBCXXABI_INCLUDES_INTERNAL}") set(LIBCXX_CXX_ABI_INTREE 1) else() set(LIBCXX_CXX_ABI_LIBNAME "none") |