Re-enable iOS filamat builds (#9598)

CMakeLists.txt

@@ -10,6 +10,7 @@ cmake_minimum_required(VERSION 3.22.1)
 # ==================================================================================================
 # Toolchain configuration
 # ==================================================================================================
+# On iOS, the deployment target is set inside third_party/clang/ios.cmake
 if (APPLE AND NOT IOS)
     # This must be set before project() is called
     set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "")
@@ -586,7 +587,7 @@ if (FILAMENT_SUPPORTS_METAL)
 endif()
 
 # Building filamat increases build times and isn't required for web, so turn it off by default.
-if (NOT WEBGL AND NOT IOS)
+if (NOT WEBGL)
     option(FILAMENT_BUILD_FILAMAT "Build filamat and JNI buildings" ON)
 else()
     option(FILAMENT_BUILD_FILAMAT "Build filamat and JNI buildings" OFF)

libs/filamat/CMakeLists.txt

@@ -1,4 +1,7 @@
 cmake_minimum_required(VERSION 3.19)
+
+include(${EXTERNAL}/clang/usage_ios_13.cmake)
+
 project(filamat)
 
 set(TARGET         filamat)

third_party/clang/iOS.cmake

@@ -103,8 +103,4 @@ IF (NOT DEFINED IOS_MIN_TARGET)
    OUTPUT_STRIP_TRAILING_WHITESPACE)
 ENDIF()
 
-SET(IOS_COMMON_FLAGS "-m${PLATFORM_FLAG_NAME}-version-min=${IOS_MIN_TARGET}")
-
-SET(CMAKE_C_FLAGS_INIT "${IOS_COMMON_FLAGS}")
-SET(CMAKE_CXX_FLAGS_INIT "${IOS_COMMON_FLAGS}")
-SET(CMAKE_ASM_FLAGS_INIT "${IOS_COMMON_FLAGS}")
+set(CMAKE_OSX_DEPLOYMENT_TARGET ${IOS_MIN_TARGET} CACHE STRING "Minimum iOS version")

third_party/clang/usage_ios_13.cmake

@@ -0,0 +1,5 @@
+# This file is included by filamat and glslang because glslang (and thus filamat) require
+# iOS 13.0+ whereas the rest of Filament targets iOS 11.0.
+if(IOS)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0")
+endif()

third_party/glslang/tnt/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.19)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+include(${EXTERNAL}/clang/usage_ios_13.cmake)
+
 # Adhere to GNU filesystem layout conventions
 include(GNUInstallDirs)