diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2020-08-12 12:46:49 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@gmail.com> | 2020-08-12 16:12:48 +0200 |
| commit | 6b488d89507e4d252b05225a203183b5e83e92ac (patch) | |
| tree | d7ee27dd61d37de20944c077618a110a42d3bd8d /src/corelib/configure.cmake | |
| parent | 95946222e6615cdf731f266530d4dc2db0f28a92 (diff) | |
Configure.json: Do not link to pthread on Android on feature testing
pthread has been removed from the NDK and the cxx11_feature detection
fails.
Fixes: QTBUG-72330
Change-Id: I22a97814b7e95011ad3944327f02343348c72b91
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/configure.cmake')
| -rw-r--r-- | src/corelib/configure.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index ec9f576db8..52eba48652 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -119,8 +119,9 @@ int pipes[2]; } ") +# special case begin # cxx11_future -if (UNIX) +if (UNIX AND NOT ANDROID) set(cxx11_future_TEST_LIBRARIES pthread) endif() qt_config_compile_test(cxx11_future @@ -141,6 +142,7 @@ std::future<int> f = std::async([]() { return 42; }); return 0; } ") +# special case end # cxx11_random qt_config_compile_test(cxx11_random |