[PATCH] D26362: [CMake] Check runtimes subdir when looking for libcxx and libuwind

[Petr Hosek via llvm-commits]

phosek created this revision.
phosek added reviewers: beanz, EricWF.
phosek added a subscriber: llvm-commits.
phosek set the repository for this revision to rL LLVM.
Herald added a subscriber: mgorny.

The runtimes subdir is the new location for runtimes, we should
include it when looking for libcxx and libunwind headers.


Repository:
  rL LLVM

https://reviews.llvm.org/D26362

Files:
  CMakeLists.txt


Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -144,6 +144,7 @@
         ${LIBCXXABI_LIBCXX_PATH}/include
         ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBCXX_INCLUDES}
         ${LLVM_MAIN_SRC_DIR}/projects/libcxx/include
+        ${LLVM_MAIN_SRC_DIR}/runtimes/libcxx/include
         ${LLVM_INCLUDE_DIR}/c++/v1
   )
 
@@ -156,6 +157,7 @@
   PATHS ${LIBCXXABI_LIBCXX_PATH}
         ${LIBCXXABI_LIBCXX_INCLUDES}/../
         ${LLVM_MAIN_SRC_DIR}/projects/libcxx/
+        ${LLVM_MAIN_SRC_DIR}/runtimes/libcxx/
   NO_DEFAULT_PATH
   )
 
@@ -374,6 +376,7 @@
           ${LIBCXXABI_LIBUNWIND_PATH}/include
           ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES}
           ${LLVM_MAIN_SRC_DIR}/projects/libunwind/include
+          ${LLVM_MAIN_SRC_DIR}/runtimes/libunwind/include
     NO_DEFAULT_PATH
   )
 
@@ -383,6 +386,7 @@
     PATHS ${LIBCXXABI_LIBUNWIND_PATH}/src/
           ${LIBCXXABI_LIBUNWIND_INCLUDES}/../src/
           ${LLVM_MAIN_SRC_DIR}/projects/libunwind/src/
+          ${LLVM_MAIN_SRC_DIR}/runtimes/libunwind/src/
     NO_DEFAULT_PATH
   )
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D26362.77075.patch
Type: text/x-patch
Size: 1146 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161107/f7926727/attachment.bin>