cmake: Specify Windows plugin path in test_bitcoin-qt property
This commit is contained in:
2 files changed
+8
-6
No files matched your search
@@ -295,8 +295,6 @@ jobs:
|
|||||||
- name: Run test suite
|
- name: Run test suite
|
||||||
if: matrix.job-type == 'standard'
|
if: matrix.job-type == 'standard'
|
||||||
working-directory: build
|
working-directory: build
|
||||||
env:
|
|
||||||
QT_PLUGIN_PATH: '${{ github.workspace }}\build\vcpkg_installed\x64-windows\Qt6\plugins'
|
|
||||||
run: |
|
run: |
|
||||||
ctest --output-on-failure --stop-on-failure -j $NUMBER_OF_PROCESSORS -C Release
|
ctest --output-on-failure --stop-on-failure -j $NUMBER_OF_PROCESSORS -C Release
|
||||||
|
|
||||||
|
|||||||
@@ -40,11 +40,15 @@ add_test(NAME test_bitcoin-qt
|
|||||||
COMMAND test_bitcoin-qt
|
COMMAND test_bitcoin-qt
|
||||||
)
|
)
|
||||||
if(WIN32 AND VCPKG_TARGET_TRIPLET)
|
if(WIN32 AND VCPKG_TARGET_TRIPLET)
|
||||||
# On Windows, vcpkg configures Qt with `-opengl dynamic`, which makes
|
set(plugin_path "$<SHELL_PATH:$<PATH:GET_PARENT_PATH,$<PATH:GET_PARENT_PATH,$<TARGET_PROPERTY:Qt6::QWindowsIntegrationPlugin,LOCATION_$<CONFIG>>>>>")
|
||||||
# the "minimal" platform plugin unusable due to internal Qt bugs.
|
set_property(TEST test_bitcoin-qt APPEND PROPERTY
|
||||||
set_tests_properties(test_bitcoin-qt PROPERTIES
|
ENVIRONMENT_MODIFICATION
|
||||||
ENVIRONMENT "QT_QPA_PLATFORM=windows"
|
# On Windows, vcpkg configures Qt with `-opengl dynamic`, which makes
|
||||||
|
# the "minimal" platform plugin unusable due to internal Qt bugs.
|
||||||
|
QT_QPA_PLATFORM=set:windows
|
||||||
|
QT_PLUGIN_PATH=set:${plugin_path}
|
||||||
)
|
)
|
||||||
|
unset(plugin_path)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install_binary_component(test_bitcoin-qt INTERNAL)
|
install_binary_component(test_bitcoin-qt INTERNAL)
|
||||||
Reference in new issue
Block a user