Fix CMake minimum version handling in Find modules for compatibility with newer CMake versions

Remove Android-specific conditional from nlohmann_json finder and apply CMake version patching universally. Replace FetchContent_MakeAvailable with manual population approach in OpenAL and GLFW3 finders to patch their minimum required CMake versions before adding subdirectories. Set CMP0169 policy to OLD to suppress deprecation warnings. Fix openal-soft source directory variable reference.

Author: gpx1000

attachments/simple_engine/CMake/FindOpenAL.cmake

@@ -68,7 +68,24 @@ if (NOT OpenAL_FOUND)
     set(ALSOFT_NO_CONFIG_UTIL ON CACHE BOOL "" FORCE)
     set(ALSOFT_INSTALL OFF CACHE BOOL "" FORCE)
 
-    FetchContent_MakeAvailable(openal-soft)
+    # Set policy to suppress the deprecation warning
+    if (POLICY CMP0169)
+        cmake_policy(SET CMP0169 OLD)
+    endif ()
+
+    FetchContent_GetProperties(openal-soft)
+    if (NOT openal-soft_POPULATED)
+        FetchContent_Populate(openal-soft)
+
+        # Update the minimum required CMake version to avoid errors on new CMake versions
+        file(READ "${openal-soft_SOURCE_DIR}/CMakeLists.txt" OPENAL_CMAKE_CONTENT)
+        string(REPLACE "cmake_minimum_required(VERSION 3.0.2)"
+                "cmake_minimum_required(VERSION 3.5)"
+                OPENAL_CMAKE_CONTENT "${OPENAL_CMAKE_CONTENT}")
+        file(WRITE "${openal-soft_SOURCE_DIR}/CMakeLists.txt" "${OPENAL_CMAKE_CONTENT}")
+
+        add_subdirectory(${openal-soft_SOURCE_DIR} ${openal-soft_BINARY_DIR})
+    endif ()
 
     # openal-soft defines a target named 'OpenAL'
     if (TARGET OpenAL)
@@ -77,8 +94,7 @@ if (NOT OpenAL_FOUND)
             add_library(OpenAL::OpenAL ALIAS OpenAL)
         endif ()
         # Satisfy find_package_handle_standard_args
-        FetchContent_GetProperties(openal-soft SOURCE_DIR openal_SOURCE_DIR)
-        set(OPENAL_INCLUDE_DIR "${openal_SOURCE_DIR}/include")
+        set(OPENAL_INCLUDE_DIR "${openal-soft_SOURCE_DIR}/include")
         set(OPENAL_LIBRARY OpenAL)
     endif ()
 endif ()

attachments/simple_engine/CMake/Findglfw3.cmake

@@ -67,13 +67,29 @@ if (NOT glfw3_FOUND)
     set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
     set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
 
-    FetchContent_MakeAvailable(glfw)
+    # Set policy to suppress the deprecation warning
+    if (POLICY CMP0169)
+        cmake_policy(SET CMP0169 OLD)
+    endif ()
+
+    FetchContent_GetProperties(glfw)
+    if (NOT glfw_POPULATED)
+        FetchContent_Populate(glfw)
+
+        # Update the minimum required CMake version to avoid errors on new CMake versions
+        file(READ "${glfw_SOURCE_DIR}/CMakeLists.txt" GLFW_CMAKE_CONTENT)
+        string(REPLACE "cmake_minimum_required(VERSION 3.0)"
+                "cmake_minimum_required(VERSION 3.5)"
+                GLFW_CMAKE_CONTENT "${GLFW_CMAKE_CONTENT}")
+        file(WRITE "${glfw_SOURCE_DIR}/CMakeLists.txt" "${GLFW_CMAKE_CONTENT}")
+
+        add_subdirectory(${glfw_SOURCE_DIR} ${glfw_BINARY_DIR})
+    endif ()
 
     # GLFW's CMakeLists.txt defines a target named 'glfw'
     if (TARGET glfw)
         set(glfw3_FOUND TRUE)
         # Satisfy find_package_handle_standard_args
-        FetchContent_GetProperties(glfw SOURCE_DIR glfw_SOURCE_DIR)
         set(GLFW3_INCLUDE_DIR "${glfw_SOURCE_DIR}/include")
         set(GLFW3_LIBRARY glfw)
     endif ()

attachments/simple_engine/CMake/Findnlohmann_json.cmake

@@ -60,7 +60,6 @@ if(NOT nlohmann_json_INCLUDE_DIR)
   if(NOT nlohmann_json_POPULATED)
     FetchContent_Populate(nlohmann_json)
 
-    if(ANDROID)
     # Update the minimum required CMake version before including the CMakeLists.txt
     file(READ "${nlohmann_json_SOURCE_DIR}/CMakeLists.txt" NLOHMANN_JSON_CMAKE_CONTENT)
     string(REPLACE "cmake_minimum_required(VERSION 3.1"
@@ -91,7 +90,6 @@ if(NOT nlohmann_json_INCLUDE_DIR)
                    "cmake_minimum_required(VERSION 3.10"
                    NLOHMANN_JSON_CMAKE_CONTENT "${NLOHMANN_JSON_CMAKE_CONTENT}")
     file(WRITE "${nlohmann_json_SOURCE_DIR}/CMakeLists.txt" "${NLOHMANN_JSON_CMAKE_CONTENT}")
-    endif()
 
     # Now add the subdirectory manually
     add_subdirectory(${nlohmann_json_SOURCE_DIR} ${nlohmann_json_BINARY_DIR})