diff options
author | Shoaib Meenai <smeenai@fb.com> | 2017-11-30 22:35:02 +0000 |
---|---|---|
committer | Shoaib Meenai <smeenai@fb.com> | 2017-11-30 22:35:02 +0000 |
commit | b44ae5f9b10d26651777750c3b01368399a1504d (patch) | |
tree | 8848e291856e110f0035f2734885b94467388b60 | |
parent | e0a9480f64277460bf76a6683debe15cd4ab1aac (diff) |
[clang] Use add_llvm_install_targets
Use this function to create the install targets rather than doing so
manually, which gains us the `-stripped` install targets to perform
stripped installations.
Differential Revision: https://reviews.llvm.org/D40675
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@319489 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | cmake/modules/AddClang.cmake | 16 | ||||
-rw-r--r-- | lib/Headers/CMakeLists.txt | 8 | ||||
-rw-r--r-- | runtime/CMakeLists.txt | 9 | ||||
-rw-r--r-- | tools/c-index-test/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tools/libclang/CMakeLists.txt | 7 |
5 files changed, 17 insertions, 31 deletions
diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake index e657059744..c09a8423f9 100644 --- a/cmake/modules/AddClang.cmake +++ b/cmake/modules/AddClang.cmake @@ -104,11 +104,9 @@ macro(add_clang_library name) RUNTIME DESTINATION bin) if (${ARG_SHARED} AND 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") + add_llvm_install_targets(install-${name} + DEPENDS ${name} + COMPONENT ${name}) endif() endif() set_property(GLOBAL APPEND PROPERTY CLANG_EXPORTS ${name}) @@ -147,11 +145,9 @@ macro(add_clang_tool name) 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") + add_llvm_install_targets(install-${name} + DEPENDS ${name} + COMPONENT ${name}) endif() set_property(GLOBAL APPEND PROPERTY CLANG_EXPORTS ${name}) endif() diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt index f81bfa159f..acfd81716a 100644 --- a/lib/Headers/CMakeLists.txt +++ b/lib/Headers/CMakeLists.txt @@ -141,9 +141,7 @@ install( DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. - add_custom_target(install-clang-headers - DEPENDS clang-headers - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_COMPONENT=clang-headers - -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") + add_llvm_install_targets(install-clang-headers + DEPENDS clang-headers + COMPONENT clang-headers) endif() diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 2190f27492..af8ab163c7 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -101,12 +101,9 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) install(CODE "execute_process\(COMMAND \${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=\${CMAKE_INSTALL_PREFIX} -P ${BINARY_DIR}/cmake_install.cmake \)" COMPONENT compiler-rt) - add_custom_target(install-compiler-rt - DEPENDS compiler-rt - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_COMPONENT=compiler-rt - -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" - USES_TERMINAL) + add_llvm_install_targets(install-compiler-rt + DEPENDS compiler-rt + COMPONENT compiler-rt) # Add top-level targets that build specific compiler-rt runtimes. set(COMPILER_RT_RUNTIMES fuzzer asan builtins dfsan lsan msan profile tsan ubsan ubsan-minimal) diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt index ad990e010e..c5cb0591c5 100644 --- a/tools/c-index-test/CMakeLists.txt +++ b/tools/c-index-test/CMakeLists.txt @@ -56,10 +56,8 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) COMPONENT c-index-test) if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. - add_custom_target(install-c-index-test - DEPENDS c-index-test - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_COMPONENT=c-index-test - -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") + add_llvm_install_targets(install-c-index-test + DEPENDS c-index-test + COMPONENT c-index-test) endif() endif() diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt index 3a51c6a5f2..4440637820 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt @@ -148,9 +148,6 @@ add_custom_target(libclang-headers) set_target_properties(libclang-headers PROPERTIES FOLDER "Misc") if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. - add_custom_target(install-libclang-headers - DEPENDS - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_COMPONENT=libclang-headers - -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") + add_llvm_install_targets(install-libclang-headers + COMPONENT libclang-headers) endif() |