diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-16 19:24:59 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-16 21:56:09 +0200 |
| commit | 13a4de6bf65d29a808ecd94b382ac0c1add9e0b3 (patch) | |
| tree | 0d8ee56585893ada9a6c3387ed8901e2611628e0 /cmake/QtBaseGlobalTargets.cmake | |
| parent | 335123f240c0b59cc62ad151dcf185160ef33696 (diff) | |
Remove target specific flags from the linker capabilities check
Remove target specific flags from static_link_order.
Move the check to the common config.tests folder.
Amends 5fb99e3860eb43f4bacacec7f4a4626cb0159b14
Pick-to: 6.2
Task-number: QTBUG-93002
Task-number: QTBUG-94528
Change-Id: I1368075ec6bd1e743b2b89fd93143df38a278ec2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBaseGlobalTargets.cmake')
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 2d858d657f..37a024ed3c 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -240,8 +240,8 @@ qt_copy_or_install(FILES # Install public config.tests files. qt_copy_or_install(DIRECTORY - "cmake/config.tests" - DESTINATION "${__GlobalConfig_install_dir}" + "config.tests/static_link_order" + DESTINATION "${__GlobalConfig_install_dir}/config.tests" ) # Install public CMake files. |