mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-21 14:40:26 -06:00
Tests: Update RunCMake.Android for NDK r22
Use `CMAKE_ANDROID_NDK_VERSION` to check for files expected based on the version of the NDK.
This commit is contained in:
@@ -5,10 +5,21 @@ if(NOT ANDROID)
|
||||
message(SEND_ERROR "CMake variable 'ANDROID' is not set to a true value.")
|
||||
endif()
|
||||
|
||||
foreach(f
|
||||
"${CMAKE_CXX_ANDROID_TOOLCHAIN_PREFIX}ar${CMAKE_CXX_ANDROID_TOOLCHAIN_SUFFIX}"
|
||||
set(files
|
||||
"${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}"
|
||||
)
|
||||
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}")
|
||||
message(SEND_ERROR "Expected file does not exist:\n \"${f}\"")
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user