try to fix 3rd party patch

Author: JalinWang

cmake/utils.cmake

@@ -1,28 +1,46 @@
 function(apply_patch_once patch_name target_dir patch_file)
-    set(mark_file "${target_dir}/.${patch_name}_patched")
+    # Store marker in build dir so it is cleaned with the build directory,
+    # avoiding stale markers when submodule sources are reset by git.
+    set(mark_file "${CMAKE_CURRENT_BINARY_DIR}/.${patch_name}_patched")
 
     if(EXISTS "${mark_file}")
-        #message(STATUS "Patch '${patch_name}' already applied to ${target_dir}, skipping.")
         return()
     endif()
 
     if(NOT EXISTS "${patch_file}")
         message(FATAL_ERROR "Patch file '${patch_file}' not found!")
     endif()
 
-    #message(STATUS "Applying patch '${patch_name}' to ${target_dir} ...")
     execute_process(
-        COMMAND git apply --ignore-space-change --ignore-whitespace "${patch_file}"
-        WORKING_DIRECTORY "${target_dir}"
-        RESULT_VARIABLE patch_result
-        OUTPUT_VARIABLE patch_stdout
-        ERROR_VARIABLE patch_stderr
+            COMMAND git apply --check --ignore-space-change --ignore-whitespace "${patch_file}"
+            WORKING_DIRECTORY "${target_dir}"
+            RESULT_VARIABLE check_result
+            OUTPUT_QUIET ERROR_QUIET
     )
 
-    if(NOT patch_result EQUAL 0)
-        message(FATAL_ERROR "Failed to apply patch '${patch_name}' to ${target_dir}:\n${patch_stderr}")
+    if (check_result EQUAL 0)
+        execute_process(
+                COMMAND git apply --ignore-space-change --ignore-whitespace "${patch_file}"
+                WORKING_DIRECTORY "${target_dir}"
+                RESULT_VARIABLE patch_result
+                OUTPUT_VARIABLE patch_stdout
+                ERROR_VARIABLE patch_stderr
+        )
+        if (NOT patch_result EQUAL 0)
+            message(FATAL_ERROR "Failed to apply patch '${patch_name}' to ${target_dir}:\n${patch_stderr}")
+        endif ()
     else()
-        #message(STATUS "Patch '${patch_name}' applied successfully:\n${patch_stdout}")
-        file(WRITE "${mark_file}" "patched")
+        # Patch cannot be applied cleanly - verify it is already applied
+        execute_process(
+                COMMAND git apply --reverse --check --ignore-space-change --ignore-whitespace "${patch_file}"
+                WORKING_DIRECTORY "${target_dir}"
+                RESULT_VARIABLE reverse_result
+                OUTPUT_QUIET ERROR_QUIET
+        )
+        if (NOT reverse_result EQUAL 0)
+            message(FATAL_ERROR "Patch '${patch_name}' cannot be applied to ${target_dir} and does not appear to be already applied.")
+        endif ()
     endif()
+
+    file(WRITE "${mark_file}" "patched")
 endfunction()