https://github.com/PeterChou1 created https://github.com/llvm/llvm-project/pull/97882
reverts https://github.com/llvm/llvm-project/pull/97540 which broke clangs standalone build >From 361e3e379df2f292d1099f48e9479742c727572f Mon Sep 17 00:00:00 2001 From: PeterChou1 <peter.c...@mail.utoronto.ca> Date: Sat, 6 Jul 2024 04:26:31 -0400 Subject: [PATCH] [clang-doc] revert asset bug fix --- clang-tools-extra/clang-doc/tool/CMakeLists.txt | 2 +- llvm/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/clang-tools-extra/clang-doc/tool/CMakeLists.txt b/clang-tools-extra/clang-doc/tool/CMakeLists.txt index 19c17a8f3a51f..e93a5728d6b6b 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 cbbf84ec286ed..12618966c4adf 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}) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
