diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-08-19 17:41:53 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-08-19 17:41:53 +0000 |
| commit | 7cb813ffc46ba687884f110d3ea7db4d40540301 (patch) | |
| tree | dbb670d59bff1a8af610b941f633fdf6014c1eab /libcxx | |
| parent | 9e00ec6195795806652b11ddd7e9ffda0935d7e1 (diff) | |
| download | bcm5719-llvm-7cb813ffc46ba687884f110d3ea7db4d40540301.tar.gz bcm5719-llvm-7cb813ffc46ba687884f110d3ea7db4d40540301.zip | |
[libcxx] Add "install-libcxx" target.
Summary: Currently you can't install libc++ from within the LLVM tree without installing all of LLVM. This patch adds an install rule for libc++.
Reviewers: mclow.lists, danalbert, jroelofs, EricWF
Subscribers: cfe-commits
Differential Revision: http://reviews.llvm.org/D11697
llvm-svn: 245470
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/cmake/Modules/HandleLibCXXABI.cmake | 1 | ||||
| -rw-r--r-- | libcxx/include/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 12 |
3 files changed, 12 insertions, 2 deletions
diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake index 4224882f422..39cca9dd238 100644 --- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake +++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake @@ -43,6 +43,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) ) install(FILES "${CMAKE_BINARY_DIR}/include/${fpath}" DESTINATION include/c++/v1/${dstdir} + COMPONENT libcxx PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) list(APPEND abilib_headers "${CMAKE_BINARY_DIR}/include/${fpath}") diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt index 95206bfeeaf..7a7c2295c21 100644 --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -17,6 +17,7 @@ file(COPY . if (LIBCXX_INSTALL_HEADERS) install(DIRECTORY . DESTINATION include/c++/v1 + COMPONENT libcxx FILES_MATCHING ${LIBCXX_HEADER_PATTERN} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index 26dee6765c7..0c83f05824c 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -134,6 +134,14 @@ set_target_properties(cxx ) install(TARGETS cxx - LIBRARY DESTINATION lib${LIBCXX_LIBDIR_SUFFIX} - ARCHIVE DESTINATION lib${LIBCXX_LIBDIR_SUFFIX} + LIBRARY DESTINATION lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT libcxx + ARCHIVE DESTINATION lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT libcxx ) + +if (NOT CMAKE_CONFIGURATION_TYPES) + add_custom_target(install-libcxx + DEPENDS cxx + COMMAND "${CMAKE_COMMAND}" + -DCMAKE_INSTALL_COMPONENT=libcxx + -P "${LIBCXX_BINARY_DIR}/cmake_install.cmake") +endif() |

