From fabbc8d183d74f498ea3a6ee2166c4cf3b05cf17 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 25 Apr 2025 16:29:35 +0200 Subject: [PATCH] cmake: use CMAKE_ANDROID_NDK variable as root of Android ndk This variable is always defined when targeting Android: - when using the toolchain file shipped along the ndk (using -DCMAKE_TOOLCHAIN_FILE=$ENV{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake) - when using the toolchain file provided by CMake (using -DCMAKE_SYSTEM_NAME=Android) (cherry picked from commit 5b1e92ae885c8dd89c3916275448abe63a9ef5d5) --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ab3d9083e..d3a90e97cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1291,8 +1291,8 @@ if(ANDROID) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/android") sdl_glob_sources("${SDL3_SOURCE_DIR}/src/core/android/*.c") - sdl_sources("${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c") - set_property(SOURCE "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-declaration-after-statement") + sdl_sources("${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c") + set_property(SOURCE "${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-declaration-after-statement") sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/android/*.c") set(HAVE_SDL_MISC TRUE) @@ -3288,7 +3288,7 @@ else() endif() if(ANDROID) - sdl_include_directories(PRIVATE SYSTEM "${ANDROID_NDK}/sources/android/cpufeatures") + sdl_include_directories(PRIVATE SYSTEM "${CMAKE_ANDROID_NDK}/sources/android/cpufeatures") endif() if(APPLE)