diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-24 13:45:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-24 13:45:50 (GMT) |
| commit | 96de37092a29cb2e7a92e9cb10b0ef47bca32732 (patch) | |
| tree | ddaacef7de12a87abd0e5c446cde824290076828 /Tests/RunCMake/Android/ndk-mips-stdout.txt | |
| parent | ccddb454b8e7ae3ae075db5fd3233ce86c8c70cb (diff) | |
| parent | 7b637ebdc97655462d08d8ff70bee5d4f32e4681 (diff) | |
| download | CMake-96de37092a29cb2e7a92e9cb10b0ef47bca32732.zip CMake-96de37092a29cb2e7a92e9cb10b0ef47bca32732.tar.gz CMake-96de37092a29cb2e7a92e9cb10b0ef47bca32732.tar.bz2 | |
Merge topic 'android-platform-modules'
7b637ebd Android: Add `ANDROID` variable to indicate the target
c2f561e5 Android: Add test cases covering use of the NDK and standalone toolchains
6b84df8d Help: Document cross compiling for Android
d7d40830 Android: Select the STL type for NDK builds
b22294bc Android: Populate compiler flags for current ABI
b6a3102a Android: Add a CMAKE_BUILD_TYPE default
d1e3cec2 Android: Add Clang -target option for current ABI
504db72d Android: Add placeholders for compiler/abi-specific settings
fa632578 Android: Avoid interfering with common pre-existing toolchain files
6299693f Android: Search for NDK and standalone toolchain in more places
29b51379 Android: Detect and save a standalone toolchain without the NDK
7d9b49fb Android: Detect settings from the CMAKE_SYSROOT if it is set
4389664a Android: Detect and save a toolchain from the NDK
328191f6 Android: Set CMAKE_SYSROOT automatically
9e032304 Android: Detect and save the architecture, ABI, and processor
fde59c4d Android: Detect and save the API level
...
Diffstat (limited to 'Tests/RunCMake/Android/ndk-mips-stdout.txt')
| -rw-r--r-- | Tests/RunCMake/Android/ndk-mips-stdout.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Tests/RunCMake/Android/ndk-mips-stdout.txt b/Tests/RunCMake/Android/ndk-mips-stdout.txt new file mode 100644 index 0000000..c744683 --- /dev/null +++ b/Tests/RunCMake/Android/ndk-mips-stdout.txt @@ -0,0 +1,2 @@ +-- Android: Targeting API '[0-9]+' with architecture 'mips', ABI 'mips', and processor 'mips' +-- Android: Selected (Clang toolchain '[^']+' with )?GCC toolchain '[^']+' |