dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-07 08:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Update RunCMake.Android for NDK r22

Browse Source 
Use `CMAKE_ANDROID_NDK_VERSION` to check for files expected based
on the version of the NDK.
This commit is contained in:
Brad King
2021-03-03 10:20:29 -05:00
parent 4950d35733
commit ed7a87f270
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Tests/RunCMake/Android/common.cmake
View File

@@ -5,10 +5,21 @@ if(NOT ANDROID)
message(SEND_ERROR "CMake variable 'ANDROID' is not set to a true value.") message(SEND_ERROR "CMake variable 'ANDROID' is not set to a true value.")
endif() endif()
foreach(f set(files
"${CMAKE_CXX_ANDROID_TOOLCHAIN_PREFIX}ar${CMAKE_CXX_ANDROID_TOOLCHAIN_SUFFIX}" "${CMAKE_CXX_ANDROID_TOOLCHAIN_PREFIX}ar${CMAKE_CXX_ANDROID_TOOLCHAIN_SUFFIX}"
)
if(NOT CMAKE_ANDROID_NDK_VERSION VERSION_GREATER_EQUAL 22)
list(APPEND files
"${CMAKE_CXX_ANDROID_TOOLCHAIN_PREFIX}ld${CMAKE_CXX_ANDROID_TOOLCHAIN_SUFFIX}" "${CMAKE_CXX_ANDROID_TOOLCHAIN_PREFIX}ld${CMAKE_CXX_ANDROID_TOOLCHAIN_SUFFIX}"
) )
endif()
if(NOT CMAKE_ANDROID_NDK_VERSION VERSION_GREATER_EQUAL 19)
list(APPEND files
"${CMAKE_C_ANDROID_TOOLCHAIN_PREFIX}gcc${CMAKE_C_ANDROID_TOOLCHAIN_SUFFIX}"
"${CMAKE_CXX_ANDROID_TOOLCHAIN_PREFIX}g++${CMAKE_CXX_ANDROID_TOOLCHAIN_SUFFIX}"
)
endif()
foreach(f IN LISTS files)
if(NOT EXISTS "${f}") if(NOT EXISTS "${f}")
message(SEND_ERROR "Expected file does not exist:\n \"${f}\"") message(SEND_ERROR "Expected file does not exist:\n \"${f}\"")
endif() endif()