diff options
| author | Shoaib Meenai <smeenai@fb.com> | 2019-05-07 19:00:37 +0000 |
|---|---|---|
| committer | Shoaib Meenai <smeenai@fb.com> | 2019-05-07 19:00:37 +0000 |
| commit | 69f1b5326d99d789d0e862f5f42d93637f13da58 (patch) | |
| tree | d4dba52933a2365bb03df65106228d633c8f7a38 /cmake/Modules/AddCompilerRT.cmake | |
| parent | b51c88520398ccc01b44826d37aea23d17ac51a3 (diff) | |
| download | compiler-rt-69f1b5326d99d789d0e862f5f42d93637f13da58.tar.gz | |
[compiler-rt] Create install targets for Darwin libraries
Darwin targets were generating CMake install rules but not the
corresponding install targets. Centralize the existing install target
creation to a function and use that function for both Darwin and
non-Darwin builds.
Differential Revision: https://reviews.llvm.org/D61541
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@360181 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules/AddCompilerRT.cmake')
| -rw-r--r-- | cmake/Modules/AddCompilerRT.cmake | 47 |
1 files changed, 5 insertions, 42 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index 3970fb415..758911684 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -240,28 +240,6 @@ function(add_compiler_rt_runtime name type) set_target_properties(${LIB_PARENT_TARGET} PROPERTIES FOLDER "Compiler-RT Misc") endif() - if(NOT TARGET install-${LIB_PARENT_TARGET}) - # The parent install target specifies the parent component to scrape up - # anything not installed by the individual install targets, and to handle - # installation when running the multi-configuration generators. - add_custom_target(install-${LIB_PARENT_TARGET} - DEPENDS ${LIB_PARENT_TARGET} - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_COMPONENT=${LIB_PARENT_TARGET} - -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") - add_custom_target(install-${LIB_PARENT_TARGET}-stripped - DEPENDS ${LIB_PARENT_TARGET} - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_COMPONENT=${LIB_PARENT_TARGET} - -DCMAKE_INSTALL_DO_STRIP=1 - -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") - set_target_properties(install-${LIB_PARENT_TARGET} PROPERTIES - FOLDER "Compiler-RT Misc") - set_target_properties(install-${LIB_PARENT_TARGET}-stripped PROPERTIES - FOLDER "Compiler-RT Misc") - add_dependencies(install-compiler-rt install-${LIB_PARENT_TARGET}) - add_dependencies(install-compiler-rt-stripped install-${LIB_PARENT_TARGET}-stripped) - endif() endif() foreach(libname ${libnames}) @@ -352,27 +330,12 @@ function(add_compiler_rt_runtime name type) endif() endif() - # We only want to generate per-library install targets if you aren't using - # an IDE because the extra targets get cluttered in IDEs. - if(NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${libname} - DEPENDS ${libname} - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_COMPONENT=${libname} - -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") - add_custom_target(install-${libname}-stripped - DEPENDS ${libname} - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_COMPONENT=${libname} - -DCMAKE_INSTALL_DO_STRIP=1 - -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") - # If you have a parent target specified, we bind the new install target - # to the parent install target. - if(LIB_PARENT_TARGET) - add_dependencies(install-${LIB_PARENT_TARGET} install-${libname}) - add_dependencies(install-${LIB_PARENT_TARGET}-stripped install-${libname}-stripped) - endif() + set(parent_target_arg) + if(LIB_PARENT_TARGET) + set(parent_target_arg PARENT_TARGET ${LIB_PARENT_TARGET}) endif() + add_compiler_rt_install_targets(${libname} ${parent_target_arg}) + if(APPLE) set_target_properties(${libname} PROPERTIES OSX_ARCHITECTURES "${LIB_ARCHS_${libname}}") |