This is an archive of the discontinued LLVM Phabricator instance.

Differential D98020

[libunwind] Install the DLL when doing "ninja install"
ClosedPublic

Authored by mstorsjo on Mar 5 2021, 1:52 AM.

Details

Reviewers
compnerd
rnk
zero9178
phosek
Group Reviewers
Restricted Project
Commits
rG39ad160468e2: [libunwind] Install the DLL when doing "ninja install"
Summary

This matches how install(... RUNTIME) is used in e.g. libcxx.

Diff Detail

Event Timeline

mstorsjo created this revision.Mar 5 2021, 1:52 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 5 2021, 1:52 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: mgorny. · View Herald Transcript
mstorsjo requested review of this revision.Mar 5 2021, 1:52 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 5 2021, 1:52 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B92261: Diff 328443.Mar 5 2021, 1:57 AM
mstorsjo added a reviewer: zero9178.Mar 6 2021, 2:43 PM
phosek accepted this revision.Mar 6 2021, 3:09 PM
phosek added a subscriber: phosek.

LGTM

This revision is now accepted and ready to land.Mar 6 2021, 3:09 PM
This revision was landed with ongoing or failed builds.Mar 7 2021, 12:47 AM
Closed by commit rG39ad160468e2: [libunwind] Install the DLL when doing "ninja install" (authored by mstorsjo). · Explain Why
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG39ad160468e2: [libunwind] Install the DLL when doing "ninja install".

Revision Contents

PathSize
libunwind/
src/
3 lines

Diff 328846

libunwind/src/CMakeLists.txt

Show First 20 Lines • Show All 177 Lines • ▼ Show 20 Lines
endif() endif()
# Add a meta-target for both libraries. # Add a meta-target for both libraries.
add_custom_target(unwind DEPENDS ${LIBUNWIND_BUILD_TARGETS}) add_custom_target(unwind DEPENDS ${LIBUNWIND_BUILD_TARGETS})
if (LIBUNWIND_INSTALL_LIBRARY) if (LIBUNWIND_INSTALL_LIBRARY)
install(TARGETS ${LIBUNWIND_INSTALL_TARGETS} install(TARGETS ${LIBUNWIND_INSTALL_TARGETS}
LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${LIBUNWIND_INSTALL_LIBRARY_DIR} COMPONENT unwind LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${LIBUNWIND_INSTALL_LIBRARY_DIR} COMPONENT unwind
ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${LIBUNWIND_INSTALL_LIBRARY_DIR} COMPONENT unwind) ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${LIBUNWIND_INSTALL_LIBRARY_DIR} COMPONENT unwind
RUNTIME DESTINATION ${LIBUNWIND_INSTALL_PREFIX}bin COMPONENT unwind)
endif() endif()
if (NOT CMAKE_CONFIGURATION_TYPES AND LIBUNWIND_INSTALL_LIBRARY) if (NOT CMAKE_CONFIGURATION_TYPES AND LIBUNWIND_INSTALL_LIBRARY)
add_custom_target(install-unwind add_custom_target(install-unwind
DEPENDS unwind DEPENDS unwind
COMMAND "${CMAKE_COMMAND}" COMMAND "${CMAKE_COMMAND}"
-DCMAKE_INSTALL_COMPONENT=unwind -DCMAKE_INSTALL_COMPONENT=unwind
-P "${LIBUNWIND_BINARY_DIR}/cmake_install.cmake") -P "${LIBUNWIND_BINARY_DIR}/cmake_install.cmake")
add_custom_target(install-unwind-stripped add_custom_target(install-unwind-stripped
DEPENDS unwind DEPENDS unwind
COMMAND "${CMAKE_COMMAND}" COMMAND "${CMAKE_COMMAND}"
-DCMAKE_INSTALL_COMPONENT=unwind -DCMAKE_INSTALL_COMPONENT=unwind
-DCMAKE_INSTALL_DO_STRIP=1 -DCMAKE_INSTALL_DO_STRIP=1
-P "${LIBUNWIND_BINARY_DIR}/cmake_install.cmake") -P "${LIBUNWIND_BINARY_DIR}/cmake_install.cmake")
endif() endif()