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 | 93c9b2ea936e92f0c53b18e60fe654cc8d91c4cf (patch) | |
| tree | 2fb5e0a55579f73d2fc3401329c0ee4a01c34610 /llvm/cmake/modules/CMakeLists.txt | |
| parent | c597fd3b4a1b85adee86baddaeb54afcdee3f894 (diff) | |
| download | bcm5719-llvm-93c9b2ea936e92f0c53b18e60fe654cc8d91c4cf.tar.gz bcm5719-llvm-93c9b2ea936e92f0c53b18e60fe654cc8d91c4cf.zip | |
Revert "CMake: Get rid of LLVMLibDeps.cmake and export the libraries normally."
This reverts commit r113632
Conflicts:
cmake/modules/AddLLVM.cmake
llvm-svn: 113819
Diffstat (limited to 'llvm/cmake/modules/CMakeLists.txt')
| -rw-r--r-- | llvm/cmake/modules/CMakeLists.txt | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt index 4e79371feec..416d7f47856 100644 --- a/llvm/cmake/modules/CMakeLists.txt +++ b/llvm/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) |
