diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-29 15:48:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-29 15:48:33 (GMT) |
| commit | 23503ba5f0425cb4e434d67b72e2b6cd60350b61 (patch) | |
| tree | 74e02bc7912fe32a5da8c0c32a49866cfacf8503 /Tests/RunCMake/Android/ndk-armeabi-v7a-stdout.txt | |
| parent | 08cd8ef5eeb53d0d5f80aff6fa60791894accfa7 (diff) | |
| parent | 97bca2f9fab58fcf5bbcb29e1e7e86e37b5cc1e0 (diff) | |
| download | CMake-23503ba5f0425cb4e434d67b72e2b6cd60350b61.zip CMake-23503ba5f0425cb4e434d67b72e2b6cd60350b61.tar.gz CMake-23503ba5f0425cb4e434d67b72e2b6cd60350b61.tar.bz2 | |
Merge topic 'android-ndk-r19'
97bca2f9fa Android: Use unified toolchain in NDK r19+
19f36c5fb2 Android: Update test to not require GCC compiler to exist in NDK
f3e32ddae9 Android: Re-order system initialization to select sysroot last
9a0720b819 Android: Clarify name of internal variable for arch triple
4e6c58d937 Android: Select NDK host tag while determining system
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3612
Diffstat (limited to 'Tests/RunCMake/Android/ndk-armeabi-v7a-stdout.txt')
| -rw-r--r-- | Tests/RunCMake/Android/ndk-armeabi-v7a-stdout.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/Android/ndk-armeabi-v7a-stdout.txt b/Tests/RunCMake/Android/ndk-armeabi-v7a-stdout.txt index 0edb4f7..554548e 100644 --- a/Tests/RunCMake/Android/ndk-armeabi-v7a-stdout.txt +++ b/Tests/RunCMake/Android/ndk-armeabi-v7a-stdout.txt @@ -1,3 +1,3 @@ -- Android: Targeting API '[0-9]+' with architecture 'arm', ABI 'armeabi-v7a', and processor 'armv7-a' --- Android: Selected (Clang toolchain '[^']+' with )?GCC toolchain '[^']+' +-- Android: Selected (unified Clang toolchain|(Clang toolchain '[^']+' with )?GCC toolchain '[^']+') .*-- CMAKE_ANDROID_ARM_NEON=0 |