CMake: enable installing utils

[mtrofin]

Summary

Added a new boolean CMake flag, LLVM_INSTALL_UTILS. When set,
the 'install' target will include in the bin directory the
utils binaries - e.g. FileCheck. This mirrors the autoconfig
behavior.

[dschuff]

LGTM, maybe Chris has a comment, as he's been working on CMake lately.

[beanz]

cmake/modules/AddLLVM.cmake

551

I would add COMPONENT arguments here to set the install component, and I would add custom install targets.

For an example see: AddLLVM.cmake:416-424.

[mtrofin]

Incorporated feedback:

• COMPONENT argument
• custom install targets

[beanz]

cmake/modules/AddLLVM.cmake

554

Sorry to nitpick, but you want to wrap this in:

if (NOT CMAKE_CONFIGURATION_TYPES)

That way you won't be creating an unwieldy number of extra targets for IDE users.

[mtrofin]

I see. I didn't fully grasp that nuance, thanks for clarifying!

[mtrofin]

Wrapped the custom install target

[beanz]

LGTM. Thanks!

[mtrofin]

Thank you!

[dschuff]

Committed as r233385

[mtrofin]

Thanks!

CMakeLists.txt

 set(LLVM_VERSION_PATCH 0)
 set(LLVM_VERSION_SUFFIX svn)
 
 if (NOT PACKAGE_VERSION)
   set(PACKAGE_VERSION
     "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}")
 endif()
 
+option(LLVM_INSTALL_UTILS "Include utility binaries in the 'install' target." OFF)
+
 option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
 
 option(LLVM_USE_FOLDERS "Enable solution folders in Visual Studio. Disable for Express versions." ON)
 if ( LLVM_USE_FOLDERS )
   set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 endif()
 
 include(VersionFromVCS)

cmake/modules/AddLLVM.cmake

macro(add_llvm_example name)
   endif()
   set_target_properties(${name} PROPERTIES FOLDER "Examples")
 endmacro(add_llvm_example name)
 
 
 macro(add_llvm_utility name)
   add_llvm_executable(${name} ${ARGN})
   set_target_properties(${name} PROPERTIES FOLDER "Utils")
+  if( LLVM_INSTALL_UTILS )
+    install (TARGETS ${name}
+      RUNTIME DESTINATION bin
+      COMPONENT ${name})
+    if (NOT CMAKE_CONFIGURATION_TYPES)
+      add_custom_target(install-${name}
+                        DEPENDS ${name}
+                        COMMAND "${CMAKE_COMMAND}"
+                                -DCMAKE_INSTALL_COMPONENT=${name}
+                                -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
+    endif()
+  endif()
 endmacro(add_llvm_utility name)
 
 
 macro(add_llvm_target target_name)
   include_directories(BEFORE
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR})
   add_llvm_library(LLVM${target_name} ${ARGN})