[clang-tools-extra] 1ed84a8 - [clang-doc] fix bug introduced by asset test (#97540)

via cfe-commits cfe-commits at lists.llvm.org
Fri Jul 5 12:27:32 PDT 2024


Author: PeterChou1
Date: 2024-07-05T15:27:25-04:00
New Revision: 1ed84a862f9ce3c60251968f23a5405f06458975

URL: https://github.com/llvm/llvm-project/commit/1ed84a862f9ce3c60251968f23a5405f06458975
DIFF: https://github.com/llvm/llvm-project/commit/1ed84a862f9ce3c60251968f23a5405f06458975.diff

LOG: [clang-doc] fix bug introduced by asset test (#97540)

Added: 
    

Modified: 
    clang-tools-extra/clang-doc/tool/CMakeLists.txt
    llvm/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clang-doc/tool/CMakeLists.txt b/clang-tools-extra/clang-doc/tool/CMakeLists.txt
index e93a5728d6b6b0..19c17a8f3a51f7 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 12618966c4adfd..cbbf84ec286ed2 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})


        


More information about the cfe-commits mailing list