Author: asl Date: Sat May 9 16:03:01 2015 New Revision: 236936 URL: http://llvm.org/viewvc/llvm-project?rev=236936&view=rev Log: LIBCXXABI_LIBUNWIND_INCLUDES is already set before calling find_path, and find_path will not update it. So cmake will throw error "include_directories given empty-string as include directory". Use other variable name for the include path and do not find the default libunwind.h in the system path.
http://reviews.llvm.org/D9641 Patch by Jingyi Wei! Modified: libcxxabi/trunk/CMakeLists.txt Modified: libcxxabi/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=236936&r1=236935&r2=236936&view=diff ============================================================================== --- libcxxabi/trunk/CMakeLists.txt (original) +++ libcxxabi/trunk/CMakeLists.txt Sat May 9 16:03:01 2015 @@ -307,12 +307,13 @@ set(LIBCXXABI_LIBUNWIND_PATH "${LIBCXXAB include_directories(include) if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM) find_path( - LIBCXXABI_LIBUNWIND_INCLUDES + LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL libunwind.h PATHS ${LIBCXXABI_LIBUNWIND_INCLUDES} ${LIBCXXABI_LIBUNWIND_PATH}/include ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES} ${LLVM_MAIN_SRC_DIR}/projects/libunwind/include + NO_DEFAULT_PATH ) find_path( @@ -329,7 +330,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_ set(LIBCXXABI_LIBUNWIND_SOURCES "") endif() - include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES}") + include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}") include_directories("${LIBCXXABI_LIBUNWIND_SOURCES}") endif () _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
