Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 1352ceb

Browse files
committedMar 19, 2015
CMake option to install utils, e.g. FileCheck
The goal is to replace nacl tests' use of a hand-crafted filecheck tool, with LLVM's FileCheck. To do so, we need to first ensure FileCheck is copied to the install directory. To that end, this CL introduces a build flag, LLVM_INSTALL_UTILS. A separate CL enables this switch in toolchain_build_pnacl.py, see https://codereview.chromium.org/1018123002/ BUG=NONE R=dschuff@chromium.org Review URL: https://codereview.chromium.org/1019043002
1 parent b82e6c6 commit 1352ceb

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed
 

‎CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ if (NOT PACKAGE_VERSION)
6565
set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}svn")
6666
endif()
6767

68+
# @LOCALMOD
69+
option(LLVM_INSTALL_UTILS "Include utility binaries in the 'install' target." OFF)
70+
6871
option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
6972

7073
option(LLVM_USE_FOLDERS "Enable solution folders in Visual Studio. Disable for Express versions." ON)

‎cmake/modules/AddLLVM.cmake

+5
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,11 @@ endmacro(add_llvm_example name)
500500
macro(add_llvm_utility name)
501501
add_llvm_executable(${name} ${ARGN})
502502
set_target_properties(${name} PROPERTIES FOLDER "Utils")
503+
# @LOCALMOD-BEGIN
504+
if( LLVM_INSTALL_UTILS )
505+
install (TARGETS ${name} RUNTIME DESTINATION bin)
506+
endif()
507+
# @LOCALMOD-END
503508
endmacro(add_llvm_utility name)
504509

505510

0 commit comments

Comments
 (0)