Skip to content
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

Jump to bottom

Fix Default Asset File locator for clang docs #97505

Closed
wants to merge 9 commits into from
Closed

Fix Default Asset File locator for clang docs #97505

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c190c9
if debug exists, go up an extra dir
bob80905 Jul 3, 2024
07662a6
cleanup comment
bob80905 Jul 3, 2024
ea1d0ce
use native to copy path, instead of assignment operator
bob80905 Jul 3, 2024
b748482
revert change in .cpp, make attempt at fixing cmake
bob80905 Jul 3, 2024
59f187f
copy works now!
bob80905 Jul 3, 2024
e7857ce
remove copy to top level build dir
bob80905 Jul 8, 2024
3b58350
singleconfig should place asset files under toplevel dir
bob80905 Jul 8, 2024
334dda0
revert old way of copying things
bob80905 Jul 8, 2024
356f47f
remove unnecessary dir check code
bob80905 Jul 9, 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: 8 additions & 7 deletions 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,17 +25,15 @@ set(assets
)

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

function(copy_files_to_dst src_dir dst_dir file)
set(src "${src_dir}/${file}")
set(dst "${dst_dir}/${file}")
add_custom_command(OUTPUT ${dst}
DEPENDS ${src}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst}
COMMENT "Copying ${file} to ${dst_dir}"
)
if (NOT EXISTS ${dst_dir})
file(MAKE_DIRECTORY ${dst_dir})
endif()
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't believe this is necessary - copy_if_different will do the right thing.

configure_file(${src} ${dst} COPYONLY)
list(APPEND out_files ${dst})
bob80905 marked this conversation as resolved.
Show resolved Hide resolved
set(out_files ${out_files} PARENT_SCOPE)
endfunction(copy_files_to_dst)
Expand All @@ -44,7 +42,10 @@ foreach(f ${assets})
install(FILES ${asset_dir}/${f}
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang-doc"
COMPONENT clang-doc)
copy_files_to_dst(${asset_dir} ${resource_dir} ${f})
foreach(config ${CMAKE_CONFIGURATION_TYPES})
damyanp marked this conversation as resolved.
Show resolved Hide resolved
set(resource_dir "${CMAKE_BINARY_DIR}/${config}/share/clang-doc")
copy_files_to_dst(${asset_dir} ${resource_dir} ${f})
endforeach(config)
endforeach(f)

add_custom_target(copy-clang-doc-assets
Expand Down
Loading