[libcxxabi] r329208 - [CMake] Support for monorepo layout

Petr Hosek via cfe-commits cfe-commits at lists.llvm.org
Wed Apr 4 10:40:59 PDT 2018


Author: phosek
Date: Wed Apr  4 10:40:59 2018
New Revision: 329208

URL: http://llvm.org/viewvc/llvm-project?rev=329208&view=rev
Log:
[CMake] Support for monorepo layout

Support finding libcxx and libunwind sources in monorepo style layout.

Differential Revision: https://reviews.llvm.org/D45269

Modified:
    libcxxabi/trunk/CMakeLists.txt

Modified: libcxxabi/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=329208&r1=329207&r2=329208&view=diff
==============================================================================
--- libcxxabi/trunk/CMakeLists.txt (original)
+++ libcxxabi/trunk/CMakeLists.txt Wed Apr  4 10:40:59 2018
@@ -99,6 +99,7 @@ else()
   set(LIBCXXABI_LIBCXX_SRC_DIRS
     "${LLVM_MAIN_SRC_DIR}/projects/libcxx"
     "${LLVM_MAIN_SRC_DIR}/runtimes/libcxx"
+    "${LLVM_MAIN_SRC_DIR}/../libcxx"
     )
 endif()
 
@@ -426,6 +427,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_
           ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES}
           ${LLVM_MAIN_SRC_DIR}/projects/libunwind/include
           ${LLVM_MAIN_SRC_DIR}/runtimes/libunwind/include
+          ${LLVM_MAIN_SRC_DIR}/../libunwind/include
     NO_DEFAULT_PATH
     NO_CMAKE_FIND_ROOT_PATH
   )




More information about the cfe-commits mailing list