Skip to content

Commit ac9d34a

Browse files
authored
[clang-doc] revert asset bug fix (#97882)
reverts #97540 which broke clangs standalone build
1 parent 874ca08 commit ac9d34a

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

clang-tools-extra/clang-doc/tool/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set(assets
2525
)
2626

2727
set(asset_dir "${CMAKE_CURRENT_SOURCE_DIR}/../assets")
28-
set(resource_dir "${LLVM_SHARE_OUTPUT_INTDIR}/clang-doc")
28+
set(resource_dir "${CMAKE_BINARY_DIR}/share/clang-doc")
2929
set(out_files)
3030

3131
function(copy_files_to_dst src_dir dst_dir file)

llvm/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,6 @@ mark_as_advanced(LLVM_EXAMPLES_INSTALL_DIR)
446446
# They are used as destination of target generators.
447447
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
448448
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
449-
set(LLVM_SHARE_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/share)
450449
if(WIN32 OR CYGWIN)
451450
# DLL platform -- put DLLs into bin.
452451
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})

0 commit comments

Comments
 (0)