Skip to content

[pull] master from GaijinEntertainment:master #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 30, 2025
Merged

[pull] master from GaijinEntertainment:master #694

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92dee57
jit: copy LLVM.lib and bindings correctly
aleksisch Dec 29, 2025
6145855
Merge pull request #1998 from aleksisch/configure-llvm-lib
borisbat Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions modules/dasLLVM/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ IF ((NOT DAS_LLVM_INCLUDED) AND ((NOT ${DAS_LLVM_DISABLED}) OR (NOT DEFINED DAS_
set(DAS_LLVM_DLL_PATH ${LLVM_INSTALL_PREFIX}/lib/libLLVM.so )
ENDIF()
get_filename_component(dll_name "${dll}" NAME)
add_custom_target(copy_llvm_dll ALL
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${DAS_LLVM_DLL_PATH}"
configure_file("${DAS_LLVM_DLL_PATH}"
"${DAS_LLVM_LIB_OUTPUT}/${DAS_LLVM_DLL_NAME}"
COPYONLY
)
ELSE()
# File not exists locally and LLVM lib not found.
Expand Down Expand Up @@ -108,7 +107,7 @@ IF ((NOT DAS_LLVM_INCLUDED) AND ((NOT ${DAS_LLVM_DISABLED}) OR (NOT DEFINED DAS_
install(FILES ${DASLLVM_SOURCES}
DESTINATION ${DAS_INSTALL_MODULESDIR}/dasLLVM/daslib
)
file(GLOB DASLLVM_BINDINGS ${DAS_LLVM_DIR}/das_llvm/*.das)
install(FILES ${DASLLVM_BINDINGS} DESTINATION ${DAS_INSTALL_MODULESDIR}/dasLLVM/das_llvm)
file(GLOB DASLLVM_BINDINGS ${DAS_LLVM_DIR}/bindings/*.das)
install(FILES ${DASLLVM_BINDINGS} DESTINATION ${DAS_INSTALL_MODULESDIR}/dasLLVM/bindings)

ENDIF()