Skip to content

Commit 5b1e92a

Browse files
madebrslouken
authored andcommitted
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)
1 parent 09b2aae commit 5b1e92a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,8 +1294,8 @@ if(ANDROID)
12941294
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/android")
12951295

12961296
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/core/android/*.c")
1297-
sdl_sources("${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c")
1298-
set_property(SOURCE "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-declaration-after-statement")
1297+
sdl_sources("${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c")
1298+
set_property(SOURCE "${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-declaration-after-statement")
12991299

13001300
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/android/*.c")
13011301
set(HAVE_SDL_MISC TRUE)
@@ -3294,7 +3294,7 @@ else()
32943294
endif()
32953295

32963296
if(ANDROID)
3297-
sdl_include_directories(PRIVATE SYSTEM "${ANDROID_NDK}/sources/android/cpufeatures")
3297+
sdl_include_directories(PRIVATE SYSTEM "${CMAKE_ANDROID_NDK}/sources/android/cpufeatures")
32983298
endif()
32993299

33003300
if(APPLE)

0 commit comments

Comments
 (0)