|
 |
383dd27 |
From 974c288631ef8d05bf3a3f91b32bf38eae16e5c8 Mon Sep 17 00:00:00 2001
|
|
|
383dd27 |
From: Tom Stellard <tstellar@redhat.com>
|
|
|
383dd27 |
Date: Mon, 6 Mar 2017 13:55:55 +0000
|
|
|
383dd27 |
Subject: [PATCH] CMake: Add LLVM_UTILS_INSTALL_DIR option
|
|
|
383dd27 |
|
|
|
383dd27 |
This is like the LLVM_TOOLS_INSTALL_DIR option, but for the utils
|
|
|
383dd27 |
that are installed when the LLVM_INSTALL_UTILS. This option
|
|
|
383dd27 |
defaults to 'bin' to remain consistent with the current behavior, but
|
|
|
383dd27 |
distros may want to install these to libexec/llvm.
|
|
|
383dd27 |
---
|
|
|
383dd27 |
CMakeLists.txt | 3 +++
|
|
|
383dd27 |
cmake/modules/AddLLVM.cmake | 2 +-
|
|
|
383dd27 |
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
383dd27 |
|
|
|
383dd27 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
383dd27 |
index 58ee3cf..f93405c 100644
|
|
|
383dd27 |
--- a/CMakeLists.txt
|
|
|
383dd27 |
+++ b/CMakeLists.txt
|
|
|
383dd27 |
@@ -281,6 +281,9 @@ set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name
|
|
|
383dd27 |
set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
|
|
|
383dd27 |
mark_as_advanced(LLVM_TOOLS_INSTALL_DIR)
|
|
|
383dd27 |
|
|
|
383dd27 |
+set(LLVM_UTILS_INSTALL_DIR "bin" CACHE STRING "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to 'bin')")
|
|
|
383dd27 |
+mark_as_advanced(LLVM_TOOLS_INSTALL_DIR)
|
|
|
383dd27 |
+
|
|
|
383dd27 |
# They are used as destination of target generators.
|
|
|
383dd27 |
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
|
|
|
383dd27 |
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
|
|
|
383dd27 |
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
|
|
|
383dd27 |
index 7f7608c..0da8162 100644
|
|
|
383dd27 |
--- a/cmake/modules/AddLLVM.cmake
|
|
|
383dd27 |
+++ b/cmake/modules/AddLLVM.cmake
|
|
|
383dd27 |
@@ -864,7 +864,7 @@ macro(add_llvm_utility name)
|
|
|
383dd27 |
set_target_properties(${name} PROPERTIES FOLDER "Utils")
|
|
|
383dd27 |
if( LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS )
|
|
|
383dd27 |
install (TARGETS ${name}
|
|
|
383dd27 |
- RUNTIME DESTINATION bin
|
|
|
383dd27 |
+ RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR}
|
|
|
383dd27 |
COMPONENT ${name})
|
|
|
383dd27 |
if (NOT CMAKE_CONFIGURATION_TYPES)
|
|
|
383dd27 |
add_custom_target(install-${name}
|
|
|
383dd27 |
--
|
|
|
383dd27 |
2.9.3
|
|
|
383dd27 |
|