Author: cbieneman Date: Fri Dec 16 11:30:51 2016 New Revision: 289963 URL: http://llvm.org/viewvc/llvm-project?rev=289963&view=rev Log: [CMake] Put headers relative to clang
When libcxx isn't building with an installed LLVM we copy the libcxx headers into the LLVM build directory so that a clang in that build tree can find the headers relative to itself. This is only important in situations where you don't have headers installed under /, which is common these days on Darwin. Modified: libcxx/trunk/include/CMakeLists.txt Modified: libcxx/trunk/include/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/CMakeLists.txt?rev=289963&r1=289962&r2=289963&view=diff ============================================================================== --- libcxx/trunk/include/CMakeLists.txt (original) +++ libcxx/trunk/include/CMakeLists.txt Fri Dec 16 11:30:51 2016 @@ -10,18 +10,14 @@ set(LIBCXX_HEADER_PATTERN ${LIBCXX_SUPPORT_HEADER_PATTERN} ) -if (LIBCXX_STANDALONE_BUILD) - set(LIBCXX_BUILD_ROOT "${LIBCXX_BINARY_DIR}") -else() - set(LIBCXX_BUILD_ROOT "${LLVM_BINARY_DIR}") +if(NOT LIBCXX_USING_INSTALLED_LLVM) + file(COPY . + DESTINATION "${LLVM_BINARY_DIR}/include/c++/v1" + FILES_MATCHING + ${LIBCXX_HEADER_PATTERN} + ) endif() -file(COPY . - DESTINATION "${LIBCXX_BUILD_ROOT}/include/c++/v1" - FILES_MATCHING - ${LIBCXX_HEADER_PATTERN} -) - if (LIBCXX_INSTALL_HEADERS) install(DIRECTORY . DESTINATION include/c++/v1 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits