Author: logan Date: Mon Oct 3 06:08:17 2016 New Revision: 283100 URL: http://llvm.org/viewvc/llvm-project?rev=283100&view=rev Log: [CMake] Fix libc++abi standalone cmake build.
The cmake files install directory has been changed to ${prefix}/lib/cmake/llvm since r259821. Searching cmake modules in ${prefix}/share/llvm/cmake will result in fatal errors. This commit fixes the out-of-tree build by changing the CMake module search path to: "$(llvm-config --obj-root)/lib/cmake/llvm" Modified: libcxxabi/trunk/CMakeLists.txt Modified: libcxxabi/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=283100&r1=283099&r2=283100&view=diff ============================================================================== --- libcxxabi/trunk/CMakeLists.txt (original) +++ libcxxabi/trunk/CMakeLists.txt Mon Oct 3 06:08:17 2016 @@ -49,7 +49,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include") set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") - set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake") + set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") set(LLVM_LIT_PATH "${LLVM_PATH}/utils/lit/lit.py") else() message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined. " _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits