diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-12 12:34:06 +0000 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-12 16:29:35 +0200 |
| commit | 52fdb9dc93c9e9c372d8d4a95b97a32bf091579d (patch) | |
| tree | 6acad9b930786689cbda9ce82fd73fe9b19f9aad /cmake/QtPostProcess.cmake | |
| parent | 6b488d89507e4d252b05225a203183b5e83e92ac (diff) | |
CMake: Fix Threads::Threads dependency handling with CMake < 3.18
Apparently CMake encods targets from different scopes with a different
encoding scheme for earlier CMake versions.
CMake 3.16.3: Threads::Threads::@<0x5604cb3f6b50>
CMake 3.18.0: ::@(0x5604cb3f6b50);Threads::Threads;::@
Handle the earlier version approach as well. It needs to be done both
when writing out 3rd party dependencies, as well as for lib prl files.
Possibly in more places as well, but I didn't detect additional
places yet.
Amends 92ee9bd6b885879090ba57e49c8bd84a06d42b2b
Task-number: QTBUG-85801
Task-number: QTBUG-85877
Change-Id: Ib348b51b2d623fb50d9080dba2beeb931d47a69c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake/QtPostProcess.cmake')
| -rw-r--r-- | cmake/QtPostProcess.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake index 02c1905f8b..6e365ec734 100644 --- a/cmake/QtPostProcess.cmake +++ b/cmake/QtPostProcess.cmake @@ -35,6 +35,8 @@ macro(qt_collect_third_party_deps target) set(dep ${base_dep}) endif() + # Strip any directory scope tokens. + qt_internal_strip_target_directory_scope_token("${dep}" dep) if(TARGET ${dep}) list(FIND third_party_deps_seen ${dep} dep_seen) |