From 1effc5799077de1bd2b840b159c7f28b8a916f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Sun, 9 Apr 2023 16:14:54 +0200 Subject: [PATCH] Fix Python package installation in CMake for tests. --- tests/python/CMakeLists.txt | 4 +++- tests/runner/CMakeLists.txt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 3c4e2dd..8cefd01 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -30,7 +30,9 @@ QT_ROOT=set:${QT_ROOT}" mo2_python_pip_install(python-tests DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pylibs - PACKAGES pytest PyQt6==6.3.0) + PACKAGES pytest + PyQt${QT_MAJOR_VERSION}==${QT_VERSION} + PyQt${QT_MAJOR_VERSION}-Qt${QT_MAJOR_VERSION}==${QT_VERSION}) add_dependencies(python-tests mobase) set_target_properties(python-tests PROPERTIES FOLDER tests/python) diff --git a/tests/runner/CMakeLists.txt b/tests/runner/CMakeLists.txt index 12bf544..42793d8 100644 --- a/tests/runner/CMakeLists.txt +++ b/tests/runner/CMakeLists.txt @@ -19,7 +19,9 @@ target_link_libraries(runner-tests PUBLIC runner) set(PYLIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/pylibs) mo2_python_pip_install(runner-tests DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pylibs - PACKAGES pytest PyQt6==6.3.0) + PACKAGES + PyQt${QT_MAJOR_VERSION}==${QT_VERSION} + PyQt${QT_MAJOR_VERSION}-Qt${QT_MAJOR_VERSION}==${QT_VERSION}) add_dependencies(runner-tests mobase)