diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-09-13 23:59:48 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-09-13 23:59:48 +0000 |
| commit | 3a210e2d302758101ac06946e86027b327c7d0f3 (patch) | |
| tree | e12390ee573b3d34a2b48b5aadfcb52d2b46296a /cmake/modules/CMakeLists.txt | |
| parent | bd916c54b7989ddbab373c61eb1ed2556ca44d27 (diff) | |
| download | external_llvm-3a210e2d302758101ac06946e86027b327c7d0f3.zip external_llvm-3a210e2d302758101ac06946e86027b327c7d0f3.tar.gz external_llvm-3a210e2d302758101ac06946e86027b327c7d0f3.tar.bz2 | |
Revert "CMake: Get rid of LLVMLibDeps.cmake and export the libraries normally."
This reverts commit r113632
Conflicts:
cmake/modules/AddLLVM.cmake
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@113819 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/modules/CMakeLists.txt')
| -rw-r--r-- | cmake/modules/CMakeLists.txt | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt index 4e79371..416d7f4 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt @@ -1,18 +1,12 @@ -set(LLVM_CFLAGS "${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -llvm_get_target_libraries(LLVM_JIT_LIBS jit) -llvm_get_target_libraries(LLVM_INTERPRETER_LIBS interpreter) -llvm_get_target_libraries(LLVM_NATIVECODEGEN_LIBS nativecodegen) -get_system_libs(LLVM_SYSTEM_LIBS) +set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm/cmake") configure_file( - LLVMConfig.cmake.in - ${LLVM_BINARY_DIR}/cmake/modules/LLVMConfig.cmake - @ONLY - ) + LLVM.cmake + ${llvm_cmake_builddir}/LLVM.cmake + @ONLY) install(FILES - ${LLVM_BINARY_DIR}/cmake/modules/LLVMConfig.cmake - DESTINATION lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/ - ) + ${llvm_cmake_builddir}/LLVM.cmake + LLVMConfig.cmake + LLVMLibDeps.cmake + DESTINATION share/llvm/cmake) |