Skip to content

cmake: Allow CLANG_RESOURCE_DIR to be absolute. #145996

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
Jun 27, 2025
Merged

cmake: Allow CLANG_RESOURCE_DIR to be absolute. #145996

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dc737a
[𝘀𝗽𝗿] initial version
pcc Jun 26, 2025
6fd81c0
Address review comment
pcc Jun 27, 2025
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
2 changes: 1 addition & 1 deletion cmake/Modules/GetClangResourceDir.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function(get_clang_resource_dir out_var)
cmake_parse_arguments(ARG "" "PREFIX;SUBDIR" "" ${ARGN})

if(DEFINED CLANG_RESOURCE_DIR AND NOT CLANG_RESOURCE_DIR STREQUAL "")
set(ret_dir bin/${CLANG_RESOURCE_DIR})
cmake_path(APPEND bin ${CLANG_RESOURCE_DIR} OUTPUT_VARIABLE ret_dir)
Copy link
Contributor

@paperchalice paperchalice Jun 27, 2025

Choose a reason for hiding this comment

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

cmake_path(APPEND <path-var> [<input>...] [OUTPUT_VARIABLE <out-var>])
IIUC here bin should be replaced by a variable name:

Suggested change
cmake_path(APPEND bin ${CLANG_RESOURCE_DIR} OUTPUT_VARIABLE ret_dir)
set(ret_dir bin)
cmake_path(APPEND ret_dir ${CLANG_RESOURCE_DIR})

Copy link
Contributor Author

@pcc pcc Jun 27, 2025

Choose a reason for hiding this comment

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

You're right, fixed.

else()
if (NOT CLANG_VERSION_MAJOR)
string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${PACKAGE_VERSION})
Expand Down
Loading