forked from OSchip/llvm-project
[CMake] Be more consistent about naming targets and components in libc++abi
This patch (and commit summary) mirror r279675 by Chris B which was applied to libc++ but not libc++abi. Summary: The point of this patch is to have a consistent convention for naming build, check and install targets so that the targets can be constructed from the project name. This change renames a bunch of CMake components and targets from libcxxabi to cxxabi. For each renamed target I've added a convenience target that matches the old target name and depends on the new target. This will preserve function of the old targets so that the change doesn't break the world. We can evaluate if it is worth removing the extra targets later. llvm-svn: 279938
This commit is contained in:
parent
5c5311f4e5
commit
36ca35f505
|
@ -134,14 +134,17 @@ endif()
|
||||||
add_custom_target(cxxabi DEPENDS ${LIBCXXABI_TARGETS})
|
add_custom_target(cxxabi DEPENDS ${LIBCXXABI_TARGETS})
|
||||||
|
|
||||||
install(TARGETS ${LIBCXXABI_TARGETS}
|
install(TARGETS ${LIBCXXABI_TARGETS}
|
||||||
LIBRARY DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT libcxxabi
|
LIBRARY DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi
|
||||||
ARCHIVE DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT libcxxabi
|
ARCHIVE DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi
|
||||||
)
|
)
|
||||||
|
|
||||||
if (NOT CMAKE_CONFIGURATION_TYPES)
|
if (NOT CMAKE_CONFIGURATION_TYPES)
|
||||||
add_custom_target(install-libcxxabi
|
add_custom_target(install-cxxabi
|
||||||
DEPENDS cxxabi
|
DEPENDS cxxabi
|
||||||
COMMAND "${CMAKE_COMMAND}"
|
COMMAND "${CMAKE_COMMAND}"
|
||||||
-DCMAKE_INSTALL_COMPONENT=libcxxabi
|
-DCMAKE_INSTALL_COMPONENT=cxxabi
|
||||||
-P "${LIBCXXABI_BINARY_DIR}/cmake_install.cmake")
|
-P "${LIBCXXABI_BINARY_DIR}/cmake_install.cmake")
|
||||||
|
|
||||||
|
# TODO: This is a legacy target name and should be removed at some point.
|
||||||
|
add_custom_target(install-libcxxabi DEPENDS install-cxxabi)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -42,7 +42,10 @@ if (NOT LIBCXXABI_STANDALONE_BUILD)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_lit_testsuite(check-libcxxabi "Running libcxxabi tests"
|
add_lit_testsuite(check-cxxabi "Running libcxxabi tests"
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
DEPENDS ${LIBCXXABI_TEST_DEPS}
|
DEPENDS ${LIBCXXABI_TEST_DEPS}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# TODO: This is a legacy target name and should be removed at some point.
|
||||||
|
add_custom_target(check-libcxxabi DEPENDS check-cxxabi)
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
|
|
||||||
<p>To run the tests:</p>
|
<p>To run the tests:</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li><code>make check-libcxxabi</code></li>
|
<li><code>make check-cxxabi</code></li>
|
||||||
</ul>
|
</ul>
|
||||||
<p>Note: in a standalone build, the system's libc++ will be used for tests. If
|
<p>Note: in a standalone build, the system's libc++ will be used for tests. If
|
||||||
the system's libc++ was statically linked against libc++abi (or linked against
|
the system's libc++ was statically linked against libc++abi (or linked against
|
||||||
|
|
Loading…
Reference in New Issue