[llvm] r272033 - Revert "Use CMAKE_INSTALL_BINDIR instead of hardcoding bin for tools install paths"

[Chris Bieneman via llvm-commits]

Yes, but I’m not sure that’s the correct solution. I’m iterating off list with the person who proposed the original patch.

The approach I’m proposing is here -> http://reviews.llvm.org/P4915

-Chris

> On Jun 7, 2016, at 1:39 PM, Keno Fischer <keno at juliacomputing.com> wrote:
> 
> Does this require loading the GNUInstallDirs cmake module?
> 
> On Tue, Jun 7, 2016 at 2:11 PM, Chris Bieneman via llvm-commits <llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>> wrote:
> Should have mentioned in the commit message this broke a bot:
> http://bb.pgr.jp/builders/cmake-llvm-x86_64-linux/builds/38387/steps/recheck_cmake/logs/stdio <http://bb.pgr.jp/builders/cmake-llvm-x86_64-linux/builds/38387/steps/recheck_cmake/logs/stdio>
> 
> I’ll work on coming up with a fix.
> 
> -Chris
> 
> > On Jun 7, 2016, at 11:04 AM, Chris Bieneman via llvm-commits <llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>> wrote:
> >
> > Author: cbieneman
> > Date: Tue Jun  7 13:04:37 2016
> > New Revision: 272033
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=272033&view=rev <http://llvm.org/viewvc/llvm-project?rev=272033&view=rev>
> > Log:
> > Revert "Use CMAKE_INSTALL_BINDIR instead of hardcoding bin for tools install paths"
> >
> > This reverts commit 0dc5a55f66ed06d7859c4e0474a87428d27775e6.
> >
> > Modified:
> >    llvm/trunk/cmake/modules/AddLLVM.cmake
> >    llvm/trunk/cmake/modules/TableGen.cmake
> >
> > Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=272033&r1=272032&r2=272033&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=272033&r1=272032&r2=272033&view=diff>
> > ==============================================================================
> > --- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
> > +++ llvm/trunk/cmake/modules/AddLLVM.cmake Tue Jun  7 13:04:37 2016
> > @@ -771,7 +771,7 @@ macro(add_llvm_tool name)
> >     if( LLVM_BUILD_TOOLS )
> >       install(TARGETS ${name}
> >               EXPORT LLVMExports
> > -              RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
> > +              RUNTIME DESTINATION bin
> >               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} ${CMAKE_INSTALL_BINDIR})"
> > +          CODE "install_symlink(${full_name} ${full_dest} bin)"
> >           COMPONENT ${component})
> >
> >   if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE)
> >
> > Modified: llvm/trunk/cmake/modules/TableGen.cmake
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/TableGen.cmake?rev=272033&r1=272032&r2=272033&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/TableGen.cmake?rev=272033&r1=272032&r2=272033&view=diff>
> > ==============================================================================
> > --- llvm/trunk/cmake/modules/TableGen.cmake (original)
> > +++ llvm/trunk/cmake/modules/TableGen.cmake Tue Jun  7 13:04:37 2016
> > @@ -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 ${CMAKE_INSTALL_BINDIR})
> > +            RUNTIME DESTINATION bin)
> >   endif()
> >   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target})
> > endmacro()
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits <http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits>
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits <http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits>
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160607/8ab01268/attachment.html>