aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qtcreatorcdbext
diff options
context:
space:
mode:
authorCristian Adam <[email protected]>2025-01-10 18:16:52 +0100
committerCristian Adam <[email protected]>2025-01-13 08:51:14 +0000
commitbd702590290a2acb800deb242e5754363228bfb7 (patch)
tree00c170361917df826b461b74aaedc085b0776160 /src/libs/qtcreatorcdbext
parent01610a983a28a30dade273bdfdbd0ca208bf1f2b (diff)
lldb.exe: use python dependencies generic deployment
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 <[email protected]>
Diffstat (limited to 'src/libs/qtcreatorcdbext')
-rw-r--r--src/libs/qtcreatorcdbext/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/qtcreatorcdbext/CMakeLists.txt b/src/libs/qtcreatorcdbext/CMakeLists.txt
index fb405758414..884f75bfee4 100644
--- a/src/libs/qtcreatorcdbext/CMakeLists.txt
+++ b/src/libs/qtcreatorcdbext/CMakeLists.txt
@@ -286,7 +286,8 @@ if (_library_enabled)
# Deploy lldb.exe and its Python dependency
find_package(Clang QUIET)
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})
install(FILES ${LLVM_TOOLS_BINARY_DIR}/${lldb_file}
DESTINATION bin/clang/bin
@@ -298,7 +299,7 @@ if (_library_enabled)
install(DIRECTORY ${LLVM_LIBRARY_DIRS}/site-packages
DESTINATION bin/clang/lib
COMPONENT qtcreatorcdbext
- PATTERN _lldb.cp311-win_amd64.pyd EXCLUDE)
+ PATTERN "_lldb.cp*64.pyd" EXCLUDE)
endif()
endif()
endif()