diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-08 15:25:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-09 06:29:38 +0000 |
| commit | 94b9b33a17e3f7760cbbf9abd021984839106647 (patch) | |
| tree | 86d1ea65efa7c55eb866268d4ef5b7eca12e7be6 /src/libs/qtcreatorcdbext | |
| parent | 7e4364fb702d5da63b4236b685d32b119531d63c (diff) | |
Install pythonXY.zip for qtcreatorcdbext
Fixes: QTCREATORBUG-24528
Change-Id: I0db1407c17ff00a7424b8b8c229f503dc4891a12
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/libs/qtcreatorcdbext')
| -rw-r--r-- | src/libs/qtcreatorcdbext/CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libs/qtcreatorcdbext/CMakeLists.txt b/src/libs/qtcreatorcdbext/CMakeLists.txt index 394405f37f..0a45ef0cc3 100644 --- a/src/libs/qtcreatorcdbext/CMakeLists.txt +++ b/src/libs/qtcreatorcdbext/CMakeLists.txt @@ -52,14 +52,15 @@ if (_library_enabled) return() endif() - set(PythonRegex "^(.*)/(.*)/(python[0-9]+)${CMAKE_IMPORT_LIBRARY_SUFFIX}$") + set(PythonRegex "^(.*)/(.*)/(python([0-9]+))${CMAKE_IMPORT_LIBRARY_SUFFIX}$") if (CMAKE_BUILD_TYPE STREQUAL "Debug") - set(PythonRegex "^(.*)/(.*)/(python[0-9]+_d)${CMAKE_IMPORT_LIBRARY_SUFFIX}$") + set(PythonRegex "^(.*)/(.*)/(python([0-9]+)_d)${CMAKE_IMPORT_LIBRARY_SUFFIX}$") endif() foreach(lib IN LISTS PYTHON_LIBRARIES) if (lib MATCHES ${PythonRegex}) set(PythonDll "${CMAKE_MATCH_1}/${CMAKE_MATCH_3}${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(PythonZip "${CMAKE_MATCH_1}/python${CMAKE_MATCH_4}.zip") break() endif() endforeach() @@ -84,13 +85,16 @@ if (_library_enabled) pyvalue.cpp pyvalue.h ) - install(FILES "${PythonDll}" + install(FILES + "${PythonDll}" + "${PythonZip}" DESTINATION lib/qtcreatorcdbext${ArchSuffix}/ COMPONENT qtcreatorcdbext) add_custom_target(copy_python_dll ALL VERBATIM) add_custom_command(TARGET copy_python_dll POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "${PythonDll}" "${PROJECT_BINARY_DIR}/lib/qtcreatorcdbext${ArchSuffix}/" + COMMAND "${CMAKE_COMMAND}" -E copy "${PythonZip}" "${PROJECT_BINARY_DIR}/lib/qtcreatorcdbext${ArchSuffix}/" VERBATIM ) endif() |