diff --git a/src/proxy/CMakeLists.txt b/src/proxy/CMakeLists.txt index 3921653..4c43cc1 100644 --- a/src/proxy/CMakeLists.txt +++ b/src/proxy/CMakeLists.txt @@ -48,8 +48,8 @@ install(FILES ${PYTHON_BUILD_PATH}/pythoncore/python${Python_VERSION_SHORT}.zip install(TARGETS mobase DESTINATION ${PYLIB_DIR}) # install PyQt6 -file(GLOB PYQT_DIR ${MO2_BUILD_PATH}/PyQt${QT_MAJOR_VERSION}*) -set(PYQT_LIB_DIR ${PYQT_DIR}/Lib/site-packages/PyQt${QT_MAJOR_VERSION}) +#file(GLOB PYQT_DIR ${MO2_BUILD_PATH}/PyQt${QT_MAJOR_VERSION}*) +set(PYQT_LIB_DIR ${PYTHON_ROOT}/Lib/site-packages/PyQt${QT_MAJOR_VERSION}) set(PYQT_TARGET_DIR ${PYLIB_DIR}/PyQt${QT_MAJOR_VERSION}) file(GLOB pyqt_files ${PYQT_LIB_DIR}/*.py ${PYQT_LIB_DIR}/*.pyd ${PYQT_LIB_DIR}/*.pyi) install(FILES ${pyqt_files} DESTINATION ${PYQT_TARGET_DIR}) diff --git a/tests/runner/CMakeLists.txt b/tests/runner/CMakeLists.txt index 12bf544..45b6305 100644 --- a/tests/runner/CMakeLists.txt +++ b/tests/runner/CMakeLists.txt @@ -19,7 +19,7 @@ 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 pytest PyQt6==6.4.0) add_dependencies(runner-tests mobase)