diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-05-06 16:38:53 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-05-11 14:35:30 +0200 |
| commit | 3a62f9e0c98d1cc311846394b744c8553ea9739c (patch) | |
| tree | d5f7fc97a08f80ae5228992d94a6b0ed0aeb5a2d /tests/auto/cmake/mockplugins/mock4plugin | |
| parent | 22a992cb12949bb15eec03f524ce97100c78bd0c (diff) | |
CMake: Resurrect test_import_plugins cmake build tests
Now that we run tests for static Qt builds in the CI, it makes sense
to restore the CMake build tests that check that static plugin
importing works correctly.
Resurrect the previously commented out test_import_plugins project and
port the mockplugins qmake projects to CMake.
mockplugins is a CMake project that uses the internal Qt CMake API to
build and install some Qt modules and plugins.
test_import_plugins depends on that test (via a CMake fixture) to
build public projects that use those plugins.
The installation of the mockplugins modules pollutes the Qt install
prefix, but in the CI that only happens on the test VM, which means
the release packages are not affected.
Locally on a developer machine the Qt install path will be polluted,
but it's not that much of a big deal. We could try and address that in
a future change by using the QT_ADDITIONAL_PACKAGES_PREFIX_PATH
functionality added for Conan to allow the installation of Qt packages
into a non-standard prefix.
Task-number: QTBUG-87580
Task-number: QTBUG-92933
Change-Id: I0841064a60a5ffba5118640d3197527a38ba6c30
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/cmake/mockplugins/mock4plugin')
| -rw-r--r-- | tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt new file mode 100644 index 0000000000..f254f044d5 --- /dev/null +++ b/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt @@ -0,0 +1,10 @@ +qt_internal_add_plugin(QMock4Plugin + CLASS_NAME QMock4Plugin + TYPE mockplugin + DEFAULT_IF FALSE + SOURCES + qmock4plugin.cpp qmock4plugin.h + PUBLIC_LIBRARIES + Qt::Core + Qt::MockPlugins1 +) |