<div dir="ltr">Hi!<div><br></div><div>This change seems to have broken my ability to build clang out-of-tree, for reasons that seem to essentially come down to LLVM_TOOLS_INSTALL_DIR not being set, resulting in generation of install_symlink() commands with a missing third parameter.</div><div><br></div><div>I'd offer a patch but I'm not sure how to best address the issue, any ideas?</div><div><br></div><div>Looks like many properties are gathered from llvm-config when doing a standalone clang build[1], although I think for this we might be able to default to 'bin' unless user overrides it.</div><div><br></div><div>Anyway hopefully there's an easy answer, thanks for your time :)</div><div><br></div><div>~Will</div><div><br></div><div>[1] <a href="https://github.com/llvm-mirror/clang/blob/1f6336d3adfb5ba2aa784f2e64cfb451d365abf2/CMakeLists.txt#L19">https://github.com/llvm-mirror/clang/blob/1f6336d3adfb5ba2aa784f2e64cfb451d365abf2/CMakeLists.txt#L19</a></div></div><br><div class="gmail_quote"><div dir="ltr">On Wed, Jun 8, 2016 at 4:26 PM Chris Bieneman via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: cbieneman<br>
Date: Wed Jun 8 16:19:26 2016<br>
New Revision: 272200<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=272200&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=272200&view=rev</a><br>
Log:<br>
[CMake] Support overriding binary install directory<br>
<br>
This patch adds a new option LLVM_TOOLS_INSTALL_DIR which allows customizing the location executables and symlinks get installed to. This adds the functionality provided by autoconf's --bindir flag.<br>
<br>
This patch is based on patches from and collaboration with Tony Kelman, and replaces <a href="http://reviews.llvm.org/D20934" rel="noreferrer" target="_blank">http://reviews.llvm.org/D20934</a>.<br>
<br>
Modified:<br>
llvm/trunk/CMakeLists.txt<br>
llvm/trunk/cmake/modules/AddLLVM.cmake<br>
llvm/trunk/cmake/modules/TableGen.cmake<br>
<br>
Modified: llvm/trunk/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=272200&r1=272199&r2=272200&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=272200&r1=272199&r2=272200&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/CMakeLists.txt (original)<br>
+++ llvm/trunk/CMakeLists.txt Wed Jun 8 16:19:26 2016<br>
@@ -201,6 +201,9 @@ endif()<br>
<br>
set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )<br>
<br>
+set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")<br>
+mark_as_advanced(LLVM_TOOLS_INSTALL_DIR)<br>
+<br>
# They are used as destination of target generators.<br>
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)<br>
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})<br>
<br>
Modified: llvm/trunk/cmake/modules/AddLLVM.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=272200&r1=272199&r2=272200&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=272200&r1=272199&r2=272200&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)<br>
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Wed Jun 8 16:19:26 2016<br>
@@ -771,7 +771,7 @@ macro(add_llvm_tool name)<br>
if( LLVM_BUILD_TOOLS )<br>
install(TARGETS ${name}<br>
EXPORT LLVMExports<br>
- RUNTIME DESTINATION bin<br>
+ RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}<br>
COMPONENT ${name})<br>
<br>
if (NOT CMAKE_CONFIGURATION_TYPES)<br>
@@ -1211,7 +1211,7 @@ function(llvm_install_symlink name dest)<br>
set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX})<br>
<br>
install(SCRIPT ${INSTALL_SYMLINK}<br>
- CODE "install_symlink(${full_name} ${full_dest} bin)"<br>
+ CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})"<br>
COMPONENT ${component})<br>
<br>
if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE)<br>
<br>
Modified: llvm/trunk/cmake/modules/TableGen.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/TableGen.cmake?rev=272200&r1=272199&r2=272200&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/TableGen.cmake?rev=272200&r1=272199&r2=272200&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/cmake/modules/TableGen.cmake (original)<br>
+++ llvm/trunk/cmake/modules/TableGen.cmake Wed Jun 8 16:19:26 2016<br>
@@ -141,7 +141,7 @@ macro(add_tablegen target project)<br>
if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY)<br>
install(TARGETS ${target}<br>
EXPORT LLVMExports<br>
- RUNTIME DESTINATION bin)<br>
+ RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR})<br>
endif()<br>
set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target})<br>
endmacro()<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>