cmake: Specify Windows plugin path in test_bitcoin-qt property
#33865
Conversation
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code Coverage & BenchmarksFor details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33865. ReviewsSee the guideline for information on the review process. |
|
Friendly ping @purpleKarrot :) |
| # the "minimal" platform plugin unusable due to internal Qt bugs. | ||
| set_tests_properties(test_bitcoin-qt PROPERTIES | ||
| ENVIRONMENT "QT_QPA_PLATFORM=windows" | ||
| set(plugin_path "$<SHELL_PATH:$<PATH:GET_PARENT_PATH,$<PATH:GET_PARENT_PATH,$<TARGET_PROPERTY:Qt6::QWindowsIntegrationPlugin,LOCATION_$<CONFIG>>>>>") |
There was a problem hiding this comment.
I think the _$<CONFIG> part is unnecessary, because the value of the LOCATION property is already config dependent.
$<PATH:GET_*,...> requires CMake version 3.24.
There was a problem hiding this comment.
I think the
_$<CONFIG>part is unnecessary, because the value of theLOCATIONproperty is already config dependent.
Are you sure about that? I tested your suggestion, and it returns the path to the “Release” plugin when building with --config Debug.
$<PATH:GET_*,...>requires CMake version 3.24.
I think it's safe, as the version of CMake shipped with Visual Studio was updated to 3.24.1 starting from version 17.4. The current minimum required Visual Studio version is 17.13. And this code is reachable only on Windows with vcpkg.
|
Tested on Windows and the Qt test runs successfully without requiring manual QT_PLUGIN_PATH environment setup. Approved |
4 participants
This PR simplifies testing on Windows by removing the need to set the
QT_PLUGIN_PATHenvironment variable for different build configurations. For example, the paths might otherwise be:C:/Users/hebasto/dev/bitcoin/build/vcpkg_installed/x64-windows/Qt6/plugins/for "Release"C:/Users/hebasto/dev/bitcoin/build/vcpkg_installed/x64-windows/debug/Qt6/plugins/for "Debug"