[clang-doc] fix paths by hard coding path to share #98099
Merged
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
|
@llvm/pr-subscribers-clang-tools-extra Author: None (PeterChou1) ChangesFixes #97507 The previous patch I put up broke clang's standalone build, this patch is a hack workaround so that the clang-docs tests can pass regression test without breaking visual studio build and other standalone clang builds Full diff: https://github.com/llvm/llvm-project/pull/98099.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 e93a5728d6b6b..601a0460d76b3 100644
--- a/clang-tools-extra/clang-doc/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-doc/tool/CMakeLists.txt
@@ -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_RUNTIME_OUTPUT_INTDIR}/../share/clang-doc")
set(out_files)
function(copy_files_to_dst src_dir dst_dir file)
|
|
I'd rephrase your commit message and title in the following way. You may want to adjust the line length to match 80 columns, since I just eyeballed it. |
ilovepi
approved these changes
Jul 8, 2024
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/169/builds/819 Here is the relevant piece of the build log for the reference: |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/164/builds/807 Here is the relevant piece of the build log for the reference: |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/125/builds/568 Here is the relevant piece of the build log for the reference: |
This was referenced Jul 9, 2024
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 14, 2024
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.
[clang-doc][cmake] Fix asset directory location for other generator types
This patch fixes how clang-doc copies asset files for the build to
match the install location for all CMake generator types. The previous
version of this patch did not account for standalone builds of
clang that may use older LLVM installs, ane which do not have the
LLVM_SHARE_OUTPUT_INTDIRdefined. Instead, we create anequivalent path using
LLVM_RUNTIME_OUTPUT_INTDIR.Fixes #97507