[libunwind] r259994 - Adapt LLVM_CMAKE_PATH for recent cmake path changes

Kamil Rytarowski via cfe-commits cfe-commits at lists.llvm.org
Sat Feb 6 08:23:18 PST 2016


Author: kamil
Date: Sat Feb  6 10:23:18 2016
New Revision: 259994

URL: http://llvm.org/viewvc/llvm-project?rev=259994&view=rev
Log:
Adapt LLVM_CMAKE_PATH for recent cmake path changes

Current LLVM installs CMake files under lib/cmake/llvm.

Modified:
    libunwind/trunk/CMakeLists.txt

Modified: libunwind/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libunwind/trunk/CMakeLists.txt?rev=259994&r1=259993&r2=259994&view=diff
==============================================================================
--- libunwind/trunk/CMakeLists.txt (original)
+++ libunwind/trunk/CMakeLists.txt Sat Feb  6 10:23:18 2016
@@ -41,7 +41,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. "
@@ -221,4 +221,3 @@ append_if(LIBUNWIND_COMPILE_FLAGS LIBUNW
 include_directories(include)
 
 add_subdirectory(src)
-




More information about the cfe-commits mailing list