Author: phosek Date: Tue Nov 8 21:22:28 2016 New Revision: 286333 URL: http://llvm.org/viewvc/llvm-project?rev=286333&view=rev Log: [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 Modified: libcxx/trunk/CMakeLists.txt Modified: libcxx/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=286333&r1=286332&r2=286333&view=diff ============================================================================== --- libcxx/trunk/CMakeLists.txt (original) +++ libcxx/trunk/CMakeLists.txt Tue Nov 8 21:22:28 2016 @@ -101,10 +101,17 @@ set_property(CACHE LIBCXX_CXX_ABI PROPER # 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") _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits