[clang-doc][cmake] Copy assets to build directory #95185
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Created using spr 1.3.4 [skip ci]
Created using spr 1.3.4
|
@llvm/pr-subscribers-clang-tools-extra Author: Paul Kirth (ilovepi) ChangesWhile we copy the asset files, like index.js, into the This patch copies the contents of the clang-doc/assets Full diff: https://github.com/llvm/llvm-project/pull/95185.diff 1 Files Affected:
diff --git a/clang-tools-extra/clang-doc/tool/CMakeLists.txt b/clang-tools-extra/clang-doc/tool/CMakeLists.txt
index fb8317b272932..c2425747562b9 100644
--- a/clang-tools-extra/clang-doc/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-doc/tool/CMakeLists.txt
@@ -25,3 +25,11 @@ install(FILES ../assets/clang-doc-default-stylesheet.css
install(FILES ../assets/index.js
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
COMPONENT clang-doc)
+
+add_custom_target(copy-clang-doc-assets
+ COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../assets" "${CMAKE_BINARY_DIR}/share/clang"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/../assets"
+ COMMENT "Copying Clang-Doc Assets"
+ )
+set_target_properties(copy-clang-doc-assets PROPERTIES FOLDER "Clang-Doc/Assets")
+add_dependencies(clang-doc copy-clang-doc-assets)
|
|
@petrhosek I'm pretty sure there's a better way to spell this, but I think we need something similar to properly test clang-doc w/o an install step. cc: @PeterChou1 |
ilovepi
changed the base branch from
users/ilovepi/spr/main.clang-doccmake-copy-assets-to-build-directory
to
main
ilovepi
requested review from
rupprecht,
keith,
aaupov,
maksfb,
rafaelauler,
ayermolo,
dcci,
ftynse,
makslevental,
stellaraccident,
aartbik,
PeimingLiu,
yinying-lisa-li,
matthias-springer,
antiagainst,
kuhar,
nicolasvasilache,
hanhanW,
banach-space,
dcaballe,
MaheshRavishankar,
JDevlieghere and
tbaederr
as code owners
|
Jeez. IDK what I've done w/ SPR to do this, but I apologize. |
ilovepi
deleted the
users/ilovepi/spr/clang-doccmake-copy-assets-to-build-directory
branch
ilovepi
added a commit
to ilovepi/llvm-project
that referenced
this pull request
Jun 12, 2024
While we copy the asset files, like index.js, into the correct location in the install step, tests do not have access to those resources in the build directory. This patch copies the contents of the clang-doc/assets directory into the build folder, so that they can be used in testing. Pull Request: llvm#95185
Endilll
removed request for
a team,
hanhanW,
maksfb,
rafaelauler,
nicolasvasilache,
Endilll,
dcaballe,
PeimingLiu,
aartbik,
ayermolo,
tbaederr and
yinying-lisa-li
ilovepi
added a commit
that referenced
this pull request
Jun 14, 2024
While we copy the asset files, like index.js, into the correct location in the install step, tests do not have access to those resources in the build directory. This patch copies the contents of the clang-doc/assets directory into the build folder, so that they can be used in testing. Pull Request: #95185
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While we copy the asset files, like index.js, into the
correct location in the install step, tests do not have
access to those resources in the build directory.
This patch copies the contents of the clang-doc/assets
directory into the build folder, so that they can be
used in testing.