Просмотр исходного кода

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

Sylvain 2 недель назад
Родитель
Сommit
f034d594a8
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      cmake/android/FindSdlAndroidPlatform.cmake

+ 2 - 2
cmake/android/FindSdlAndroidPlatform.cmake

@@ -65,7 +65,7 @@ function(_sdl_is_valid_android_platform_root RESULT VERSION PLATFORM_ROOT)
     set(result FALSE)
     set(result FALSE)
     set(version -1)
     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")
     if(root_match AND EXISTS "${PLATFORM_ROOT}/android.jar")
         set(result TRUE)
         set(result TRUE)
         set(version "${CMAKE_MATCH_1}")
         set(version "${CMAKE_MATCH_1}")
@@ -88,7 +88,7 @@ function(_sdl_find_android_platform_root ROOT)
     set(max_platform_root "")
     set(max_platform_root "")
     foreach(platform_root IN LISTS platform_roots)
     foreach(platform_root IN LISTS platform_roots)
       _sdl_is_valid_android_platform_root(is_valid platform_version "${platform_root}")
       _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_version "${platform_version}")
         set(max_platform_root "${platform_root}")
         set(max_platform_root "${platform_root}")
       endif()
       endif()