diff options
| author | PeterChou1 <peter.chou@mail.utoronto.ca> | 2024-07-05 15:27:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-05 15:27:25 -0400 |
| commit | 1ed84a862f9ce3c60251968f23a5405f06458975 (patch) | |
| tree | 6657103d0c8407b340123b0b70cd9fb5845727d8 | |
| parent | 683c8e9913cd87e0b2a8e083298cd3ebc67923fe (diff) | |
| download | llvm-1ed84a862f9ce3c60251968f23a5405f06458975.zip llvm-1ed84a862f9ce3c60251968f23a5405f06458975.tar.gz llvm-1ed84a862f9ce3c60251968f23a5405f06458975.tar.bz2 | |
[clang-doc] fix bug introduced by asset test (#97540)
| -rw-r--r-- | clang-tools-extra/clang-doc/tool/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llvm/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/clang-tools-extra/clang-doc/tool/CMakeLists.txt b/clang-tools-extra/clang-doc/tool/CMakeLists.txt index e93a572..19c17a8f 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_SHARE_OUTPUT_INTDIR}/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 1261896..cbbf84e 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -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}) |