mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-09-09 06:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix android build with SDK 37.2: Allow dots in platform directory names and use CMake version comparison

Browse Source
This commit is contained in:
Sylvain
2026-09-04 19:03:23 +02:00
committed by Sylvain Becker
parent d4410b9a7c
commit f034d594a8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/android/FindSdlAndroidPlatform.cmake
View File

@@ -65,7 +65,7 @@ function(_sdl_is_valid_android_platform_root RESULT VERSION PLATFORM_ROOT)
set(result FALSE)
set(version -1)
string(REGEX MATCH "/android-([0-9]+)$" root_match "${PLATFORM_ROOT}")
string(REGEX MATCH "/android-([0-9][0-9.]*)$" root_match "${PLATFORM_ROOT}")
if(root_match AND EXISTS "${PLATFORM_ROOT}/android.jar")
set(result TRUE)
set(version "${CMAKE_MATCH_1}")
@@ -88,7 +88,7 @@ function(_sdl_find_android_platform_root ROOT)
set(max_platform_root "")
foreach(platform_root IN LISTS platform_roots)
_sdl_is_valid_android_platform_root(is_valid platform_version "${platform_root}")
if(is_valid AND platform_version GREATER max_platform_version)
if(is_valid AND platform_version VERSION_GREATER max_platform_version)
set(max_platform_version "${platform_version}")
set(max_platform_root "${platform_root}")
endif()