Skip to content

[clang-doc] fix bug introduced by asset test #97540

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 10 commits into from
Jul 5, 2024
Merged

[clang-doc] fix bug introduced by asset test #97540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b8dd4f6
[clang-doc] fix path bug introduced by asset test
PeterChou1 Jul 3, 2024
cf993cf
[clang-doc] modify cmake file to fix asset install path
PeterChou1 Jul 3, 2024
e389b78
[clang-doc] fix nit
PeterChou1 Jul 3, 2024
4733341
[llvm] modify cmake list to add shared directory
PeterChou1 Jul 3, 2024
3433bfe
[clang-doc] readd resource directory
PeterChou1 Jul 3, 2024
8819740
[clang-doc] use LLVM_RUNTIME_OUTPUT_INTDIR
PeterChou1 Jul 3, 2024
50bc61f
[llvm] fix version
PeterChou1 Jul 3, 2024
0f63fd2
[llvm] introduce new cmake global variable LLVM_SHARE_OUTPUT_INTDIR
PeterChou1 Jul 4, 2024
f364f41
[clang-doc] fix syntax error
PeterChou1 Jul 4, 2024
fddc9d3
Merge branch 'main' into clang-doc-fix-path-bug
PeterChou1 Jul 4, 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
2 changes: 1 addition & 1 deletion clang-tools-extra/clang-doc/tool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set(assets
)

set(asset_dir "${CMAKE_CURRENT_SOURCE_DIR}/../assets")
set(resource_dir "${CMAKE_BINARY_DIR}/share/clang-doc")
set(resource_dir "${LLVM_SHARE_OUTPUT_INTDIR}/clang-doc")
set(out_files)

function(copy_files_to_dst src_dir dst_dir file)
Expand Down
1 change: 1 addition & 0 deletions llvm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ mark_as_advanced(LLVM_EXAMPLES_INSTALL_DIR)
# They are used as destination of target generators.
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
set(LLVM_SHARE_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/share)
if(WIN32 OR CYGWIN)
# DLL platform -- put DLLs into bin.
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
Expand Down