diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | cmake/modules/AddLLVM.cmake | 4 | ||||
| -rwxr-xr-x | cmake/modules/AddPartiallyLinkedObject.cmake | 2 | ||||
| -rw-r--r-- | docs/CMake.html | 5 |
4 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e7b8c16f1..2e2cf358e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ set(LLVM_MAIN_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/include) set(LLVM_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(LLVM_TOOLS_BINARY_DIR ${LLVM_BINARY_DIR}/bin) set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples) +set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) set(LLVM_ALL_TARGETS Alpha diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index a21ed20d3b..e5256746bc 100755 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -10,8 +10,8 @@ macro(add_llvm_library name) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) endif( LLVM_COMMON_DEPENDS ) install(TARGETS ${name} - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} + ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) endmacro(add_llvm_library name) diff --git a/cmake/modules/AddPartiallyLinkedObject.cmake b/cmake/modules/AddPartiallyLinkedObject.cmake index d20666dd79..0f92455eac 100755 --- a/cmake/modules/AddPartiallyLinkedObject.cmake +++ b/cmake/modules/AddPartiallyLinkedObject.cmake @@ -38,5 +38,5 @@ macro(add_partially_linked_object lib) set( llvm_lib_targets ${llvm_lib_targets} ${tnplo} PARENT_SCOPE ) endif( ) install(FILES ${pll} - DESTINATION lib) + DESTINATION lib${LLVM_LIBDIR_SUFFIX}) endmacro(add_partially_linked_object lib) diff --git a/docs/CMake.html b/docs/CMake.html index 606d3995af..1f50d397f0 100644 --- a/docs/CMake.html +++ b/docs/CMake.html @@ -217,6 +217,11 @@ <dd>Path where LLVM will be installed if "make install" is invoked or the "INSTALL" target is built.</dd> + <dt><b>LLVM_LIBDIR_SUFFIX</b>:STRING</dt> + <dd>Extra suffix to append to the directory where libraries are to + be installed. On a 64-bit architecture, one could use + -DLLVM_LIBDIR_SUFFIX=64 to install libraries to /usr/lib64.</dd> + <dt><b>CMAKE_C_FLAGS</b>:STRING</dt> <dd>Extra flags to use when compiling C source files.</dd> |