diff options
author | Alexey Edelev <alexey.edelev@qt.io> | 2021-05-19 19:46:24 +0200 |
---|---|---|
committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-05-27 14:28:17 +0200 |
commit | 19e789bace887105badae83c0a79429bbf8e8221 (patch) | |
tree | 1e369b20032c64cc5cb49b9073dbc70df11325d5 /tests/auto/cmake/CMakeLists.txt | |
parent | 029425478aed1454ec3f374af0284371d050ca68 (diff) |
Implement propagation of object files to the end-point executable
This proposal collects all the resource objects to the qt-specific
property of the static libraries. This is done to avoid littering
of other static libraries and put resource object files to the
source part of the linker line when linking the end-point
executable.
The way we link object resource libraries is changed back to the
target_link_libraries approach as we may omit using finalizers
with linkers other than ld. Users may enforce finalizers by calling
the qt6_enable_resource_objects_finalizer_mode function if need.
Refactor tests related to the static resources.
Amends ddaa7150d85624ab545ccfe098fe8b2d18241940
Task-number: QTBUG-93002
Change-Id: I74135e291cd82fb54d1b284b4b4a1e002b1fef98
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/cmake/CMakeLists.txt')
-rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index ff3edf922a..b95c530640 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -251,7 +251,9 @@ _qt_internal_test_expect_pass(test_add_resources_binary_generated BINARY test_add_resources_binary_generated) include(test_plugin_shared_static_flavor.cmake) -_qt_internal_test_expect_pass(test_init_resources_static_plugin - BINARY test_init_resources_static_plugin) _qt_internal_test_expect_pass(tst_qaddpreroutine BINARY tst_qaddpreroutine) + +_qt_internal_test_expect_pass(test_static_resources + BINARY "${CMAKE_CTEST_COMMAND}" + BINARY_ARGS "-V") |