This is an archive of the discontinued LLVM Phabricator instance.

Differential D142365

[libc++] Fix installation path for the modulemap
ClosedPublic

Authored by ldionne on Jan 23 2023, 7:20 AM.

Details

Reviewers
chapuni
Group Reviewers
Restricted Project
Commits
rG3c8397fa83fe: [libc++] Fix installation path for the modulemap
Summary

As pointed out in a post-commit comment of https://reviews.llvm.org/rGd00e035a4270.

Diff Detail

Event Timeline

ldionne created this revision.Jan 23 2023, 7:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 23 2023, 7:20 AM
ldionne requested review of this revision.Jan 23 2023, 7:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 23 2023, 7:20 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
ldionne mentioned this in rGd00e035a4270: [libc++] Make sure we install the modulemap file with install-cxx-headers.Jan 23 2023, 7:20 AM
Harbormaster completed remote builds in B209371: Diff 491366.Jan 23 2023, 8:46 AM
chapuni accepted this revision.Jan 23 2023, 1:18 PM

Thanks. I have confirmed it works.

ldionne accepted this revision as: Restricted Project.Jan 23 2023, 5:12 PM
This revision is now accepted and ready to land.Jan 23 2023, 5:12 PM
This revision was landed with ongoing or failed builds.Jan 23 2023, 5:12 PM
Closed by commit rG3c8397fa83fe: [libc++] Fix installation path for the modulemap (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG3c8397fa83fe: [libc++] Fix installation path for the modulemap.

Revision Contents

PathSize
libcxx/
include/
9 lines

Diff 491568

libcxx/include/CMakeLists.txt

Show First 20 Lines • Show All 903 Lines • ▼ Show 20 Lines foreach(file ${files})
get_filename_component(dir ${file} DIRECTORY) get_filename_component(dir ${file} DIRECTORY)
install(FILES ${file} install(FILES ${file}
DESTINATION "${LIBCXX_INSTALL_INCLUDE_DIR}/${dir}" DESTINATION "${LIBCXX_INSTALL_INCLUDE_DIR}/${dir}"
COMPONENT cxx-headers COMPONENT cxx-headers
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
) )
endforeach() endforeach()
# Install the generated __config_site and the generated modulemap file. # Install the generated __config_site file to the per-target include dir.
install(FILES "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site" install(FILES "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site"
"${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap"
DESTINATION "${LIBCXX_INSTALL_INCLUDE_TARGET_DIR}" DESTINATION "${LIBCXX_INSTALL_INCLUDE_TARGET_DIR}"
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
COMPONENT cxx-headers) COMPONENT cxx-headers)
# Install the generated modulemap file to the generic include dir.
install(FILES "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap"
DESTINATION "${LIBCXX_INSTALL_INCLUDE_DIR}"
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
COMPONENT cxx-headers)
if (NOT CMAKE_CONFIGURATION_TYPES) if (NOT CMAKE_CONFIGURATION_TYPES)
add_custom_target(install-cxx-headers add_custom_target(install-cxx-headers
DEPENDS cxx-headers DEPENDS cxx-headers
COMMAND "${CMAKE_COMMAND}" COMMAND "${CMAKE_COMMAND}"
-DCMAKE_INSTALL_COMPONENT=cxx-headers -DCMAKE_INSTALL_COMPONENT=cxx-headers
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake") -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
# Stripping is a no-op for headers # Stripping is a no-op for headers
add_custom_target(install-cxx-headers-stripped DEPENDS install-cxx-headers) add_custom_target(install-cxx-headers-stripped DEPENDS install-cxx-headers)
endif() endif()
endif() endif()