[PATCH] D20934: Use CMAKE_INSTALL_BINDIR instead of hardcoding bin for tools install paths

[Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL272031: Use CMAKE_INSTALL_BINDIR instead of hardcoding bin for tools install paths (authored by cbieneman).

Changed prior to commit:
  http://reviews.llvm.org/D20934?vs=59465&id=59915#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D20934

Files:
  llvm/trunk/cmake/modules/AddLLVM.cmake
  llvm/trunk/cmake/modules/TableGen.cmake

Index: llvm/trunk/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake
+++ llvm/trunk/cmake/modules/AddLLVM.cmake
@@ -771,7 +771,7 @@
     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 @@
   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)
Index: llvm/trunk/cmake/modules/TableGen.cmake
===================================================================
--- llvm/trunk/cmake/modules/TableGen.cmake
+++ llvm/trunk/cmake/modules/TableGen.cmake
@@ -141,7 +141,7 @@
   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()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D20934.59915.patch
Type: text/x-patch
Size: 1392 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160607/278929eb/attachment.bin>