Skip to content

[libcxx] [modules] Fix relative paths with absolute LIBCXX_INSTALL_MODULES_DIR #85756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 20, 2024
Merged

[libcxx] [modules] Fix relative paths with absolute LIBCXX_INSTALL_MODULES_DIR #85756

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb5a9e9
[libcxx] [modules] Fix relative paths with absolute LIBCXX_INSTALL_MO…
mstorsjo Mar 19, 2024
a97b2fb
Use cmake_path(ABSOLUTE_PATH) instead of a custom function
mstorsjo Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions libcxx/modules/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,23 @@ add_custom_target(generate-cxx-modules
${_all_modules}
)


function(make_absolute OUT_VAR INPUT BASE)
if (IS_ABSOLUTE ${INPUT})
set(${OUT_VAR} "${INPUT}" PARENT_SCOPE)
else()
set(${OUT_VAR} "${BASE}/${INPUT}" PARENT_SCOPE)
endif()
endfunction()

# Configure the modules manifest.
# Use the relative path between the installation and the module in the json
# file. This allows moving the entire installation to a different location.
make_absolute(ABS_LIBRARY_DIR "${LIBCXX_INSTALL_LIBRARY_DIR}" "${CMAKE_INSTALL_PREFIX}")
make_absolute(ABS_MODULES_DIR "${LIBCXX_INSTALL_MODULES_DIR}" "${CMAKE_INSTALL_PREFIX}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you implement this function instead of using CMake facilities?
https://cmake.org/cmake/help/latest/command/cmake_path.html#absolute-path

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't aware of this function, and it retained the old functionality as it was (just concatenating it manually) for non-absolute paths. But I can try to use this instead.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to use cmake_path(ABSOLUTE_PATH ... now instead, thanks for the suggestion!

file(RELATIVE_PATH LIBCXX_MODULE_RELATIVE_PATH
${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_LIBRARY_DIR}
${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_MODULES_DIR})
${ABS_LIBRARY_DIR}
${ABS_MODULES_DIR})
configure_file(
"modules.json.in"
"${LIBCXX_LIBRARY_DIR}/libc++.modules.json"
Expand Down