diff options
Diffstat (limited to 'toolchain/Android.cmake')
| -rw-r--r-- | toolchain/Android.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index 5a48464c..280f129d 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -179,7 +179,11 @@ endif() # armv7 really doesn't like mixing PIC/PIE code. # Since we only have to care about a single compiler, # hard-code the values here. -if (NOT TARGET Threads::Threads) +# Qt6 fixes this and breaks if we define Threads::Threads here. +# We cannot use our usual Qt version check at this point though yet, +# se check whether we are chainloaded by the Qt toolchain as an indicator +# for Qt6. +if (NOT TARGET Threads::Threads AND NOT DEFINED __qt_chainload_toolchain_file) set(Threads_FOUND TRUE) set(CMAKE_THREAD_LIBS_INIT "-pthread") add_library(Threads::Threads INTERFACE IMPORTED) |