diff options
| author | PeterChou1 <peter.chou@mail.utoronto.ca> | 2024-07-06 04:29:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-06 04:29:49 -0400 |
| commit | ac9d34a2eed4c4d58edf25b92e397faa76170d00 (patch) | |
| tree | 7355dcdd48cec26451e174acef45e52f19bbda1d | |
| parent | 874ca08645420413e525054a47caf039bebde28b (diff) | |
| download | llvm-ac9d34a2eed4c4d58edf25b92e397faa76170d00.zip llvm-ac9d34a2eed4c4d58edf25b92e397faa76170d00.tar.gz llvm-ac9d34a2eed4c4d58edf25b92e397faa76170d00.tar.bz2 | |
[clang-doc] revert asset bug fix (#97882)
reverts https://github.com/llvm/llvm-project/pull/97540
which broke clangs standalone build
| -rw-r--r-- | clang-tools-extra/clang-doc/tool/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llvm/CMakeLists.txt | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/clang-tools-extra/clang-doc/tool/CMakeLists.txt b/clang-tools-extra/clang-doc/tool/CMakeLists.txt index 19c17a8f..e93a572 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 "${LLVM_SHARE_OUTPUT_INTDIR}/clang-doc") +set(resource_dir "${CMAKE_BINARY_DIR}/share/clang-doc") set(out_files) function(copy_files_to_dst src_dir dst_dir file) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index cbbf84e..1261896 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -446,7 +446,6 @@ 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}) |