Author: smeenai Date: Thu Nov 30 14:35:02 2017 New Revision: 319489 URL: http://llvm.org/viewvc/llvm-project?rev=319489&view=rev Log: [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 Modified: cfe/trunk/cmake/modules/AddClang.cmake cfe/trunk/lib/Headers/CMakeLists.txt cfe/trunk/runtime/CMakeLists.txt cfe/trunk/tools/c-index-test/CMakeLists.txt cfe/trunk/tools/libclang/CMakeLists.txt Modified: cfe/trunk/cmake/modules/AddClang.cmake URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/cmake/modules/AddClang.cmake?rev=319489&r1=319488&r2=319489&view=diff ============================================================================== --- cfe/trunk/cmake/modules/AddClang.cmake (original) +++ cfe/trunk/cmake/modules/AddClang.cmake Thu Nov 30 14:35:02 2017 @@ -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() Modified: cfe/trunk/lib/Headers/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/CMakeLists.txt?rev=319489&r1=319488&r2=319489&view=diff ============================================================================== --- cfe/trunk/lib/Headers/CMakeLists.txt (original) +++ cfe/trunk/lib/Headers/CMakeLists.txt Thu Nov 30 14:35:02 2017 @@ -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() Modified: cfe/trunk/runtime/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/CMakeLists.txt?rev=319489&r1=319488&r2=319489&view=diff ============================================================================== --- cfe/trunk/runtime/CMakeLists.txt (original) +++ cfe/trunk/runtime/CMakeLists.txt Thu Nov 30 14:35:02 2017 @@ -101,12 +101,9 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND E 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) Modified: cfe/trunk/tools/c-index-test/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/CMakeLists.txt?rev=319489&r1=319488&r2=319489&view=diff ============================================================================== --- cfe/trunk/tools/c-index-test/CMakeLists.txt (original) +++ cfe/trunk/tools/c-index-test/CMakeLists.txt Thu Nov 30 14:35:02 2017 @@ -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() Modified: cfe/trunk/tools/libclang/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CMakeLists.txt?rev=319489&r1=319488&r2=319489&view=diff ============================================================================== --- cfe/trunk/tools/libclang/CMakeLists.txt (original) +++ cfe/trunk/tools/libclang/CMakeLists.txt Thu Nov 30 14:35:02 2017 @@ -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() _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits