diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-06-07 18:01:16 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-06-07 18:01:16 +0000 |
| commit | 01fcbaf8e9a83130e0bc372a46ca0e4d37d6d33c (patch) | |
| tree | 918fe383f1a3a6103190be7de9be78de8ca7d07a | |
| parent | 7b14a62d36cd57e51887247a249940d299fe0be9 (diff) | |
| download | bcm5719-llvm-01fcbaf8e9a83130e0bc372a46ca0e4d37d6d33c.tar.gz bcm5719-llvm-01fcbaf8e9a83130e0bc372a46ca0e4d37d6d33c.zip | |
Use CMAKE_INSTALL_BINDIR instead of hardcoding bin for tools install paths
Summary:
This allows customizing the location executables and symlinks get installed to,
as with --bindir in autotools.
Reviewers: loladiro, beanz
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D20934
llvm-svn: 272031
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 4 | ||||
| -rw-r--r-- | llvm/cmake/modules/TableGen.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index cc7445fb2cf..117960c0bcc 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -771,7 +771,7 @@ macro(add_llvm_tool name) if( LLVM_BUILD_TOOLS ) install(TARGETS ${name} EXPORT LLVMExports - RUNTIME DESTINATION bin + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name}) if (NOT CMAKE_CONFIGURATION_TYPES) @@ -1211,7 +1211,7 @@ function(llvm_install_symlink name dest) set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) install(SCRIPT ${INSTALL_SYMLINK} - CODE "install_symlink(${full_name} ${full_dest} bin)" + CODE "install_symlink(${full_name} ${full_dest} ${CMAKE_INSTALL_BINDIR})" COMPONENT ${component}) if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake index fca7d1bda4b..8ae6bf31b13 100644 --- a/llvm/cmake/modules/TableGen.cmake +++ b/llvm/cmake/modules/TableGen.cmake @@ -141,7 +141,7 @@ macro(add_tablegen target project) if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(TARGETS ${target} EXPORT LLVMExports - RUNTIME DESTINATION bin) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target}) endmacro() |
