feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

lldb.exe: use python dependencies generic deployment

Browse Source 
By using file globbing expressions, the python*.dll|zip file names do not
have to be hardcoded with their respective version numbers.

Fixes: QTCREATORBUG-32310
Change-Id: I6a8f6bbd75530a16f54a2fd4d7030e88d3f82888
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2025-01-10 18:16:52 +01:00
parent 01610a983a
commit bd70259029
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/qtcreatorcdbext/CMakeLists.txt
View File

@@ -286,7 +286,8 @@ if (_library_enabled)
# Deploy lldb.exe and its Python dependency # Deploy lldb.exe and its Python dependency
find_package(Clang QUIET) find_package(Clang QUIET)
if (LLVM_TOOLS_BINARY_DIR AND LLVM_LIBRARY_DIRS) if (LLVM_TOOLS_BINARY_DIR AND LLVM_LIBRARY_DIRS)
foreach(lldb_file lldb.exe lldb-dap.exe liblldb.dll python311.zip python311.dll) file(GLOB python_files RELATIVE ${LLVM_TOOLS_BINARY_DIR} "${LLVM_TOOLS_BINARY_DIR}/python*")
foreach(lldb_file lldb.exe lldb-dap.exe liblldb.dll ${python_files})
if (EXISTS ${LLVM_TOOLS_BINARY_DIR}/${lldb_file}) if (EXISTS ${LLVM_TOOLS_BINARY_DIR}/${lldb_file})
install(FILES ${LLVM_TOOLS_BINARY_DIR}/${lldb_file} install(FILES ${LLVM_TOOLS_BINARY_DIR}/${lldb_file}
DESTINATION bin/clang/bin DESTINATION bin/clang/bin
@@ -298,7 +299,7 @@ if (_library_enabled)
install(DIRECTORY ${LLVM_LIBRARY_DIRS}/site-packages install(DIRECTORY ${LLVM_LIBRARY_DIRS}/site-packages
DESTINATION bin/clang/lib DESTINATION bin/clang/lib
COMPONENT qtcreatorcdbext COMPONENT qtcreatorcdbext
PATTERN _lldb.cp311-win_amd64.pyd EXCLUDE) PATTERN "_lldb.cp*64.pyd" EXCLUDE)
endif() endif()
endif() endif()
endif() endif()