From 0294ada0b91ebebfb144211e3459dcd98fc73857 Mon Sep 17 00:00:00 2001
From: Andrew Rabert <ar@nullsum.net>
Date: Mon, 27 Oct 2025 20:06:24 -0400
Subject: [PATCH] Fix development build using system js resources Copy native
 resources to build directory on all platforms

---
 CMakeModules/utils.cmake | 26 +++++++-------------------
 src/CMakeLists.txt       |  2 +-
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/CMakeModules/utils.cmake b/CMakeModules/utils.cmake
index db83e26..8fe100b 100644
--- a/CMakeModules/utils.cmake
+++ b/CMakeModules/utils.cmake
@@ -14,38 +14,26 @@ function(copy_resources target)
   if(XCODE)
     return()
   endif()
-  
+
   get_property(RESOURCE_LIST GLOBAL PROPERTY _${target}_RESOURCE_LIST)
 
   if(RESOURCE_LIST)
-    set_policy(CMP0026 OLD)
-
-    # we read the LOCATION from the target instead of using a generator
-    # here since add_custom_command doesn't support generator expresessions
-    # in the output field, and this is still cleaner than hardcoding the path
-    # of the output binary.
-    #
-    get_property(TARGET_LOC TARGET ${target} PROPERTY LOCATION)
-    get_filename_component(TARGET_DIR ${TARGET_LOC} DIRECTORY)
+    # Use generator expression instead of deprecated LOCATION property
     if(APPLE)
-      set(TARGET_LOC ${TARGET_DIR}/..)
+      set(TARGET_LOC $<TARGET_FILE_DIR:${target}>/..)
     else()
-      set(TARGET_LOC ${TARGET_DIR})
+      set(TARGET_LOC $<TARGET_FILE_DIR:${target}>)
     endif()
 
     foreach(RF ${RESOURCE_LIST})
       string(REPLACE "|" ";" PARTS "${RF}")
       list(GET PARTS 0 SOURCE_FILE)
       list(GET PARTS 1 _TARGET_FILE)
-      set(TARGET_FILE ${TARGET_LOC}/${_TARGET_FILE})
-      add_custom_command(OUTPUT ${TARGET_FILE}
-                         COMMAND ${CMAKE_COMMAND} -E copy "${SOURCE_FILE}" "${TARGET_FILE}"
+      add_custom_command(TARGET ${target} POST_BUILD
+                         COMMAND ${CMAKE_COMMAND} -E copy "${SOURCE_FILE}" "${TARGET_LOC}/${_TARGET_FILE}"
                          DEPENDS ${SOURCE_FILE}
-                         COMMENT "CopyResource (${target}): ${TARGET_FILE}")
-      list(APPEND RESOURCES ${TARGET_FILE})
+                         COMMENT "CopyResource (${target}): ${_TARGET_FILE}")
     endforeach()
-    add_custom_target(${target}_CopyResources DEPENDS ${RESOURCES})
-    add_dependencies(${target} ${target}_CopyResources)
   endif(RESOURCE_LIST)
 endfunction()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9df49da..ae7fe9d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -106,8 +106,8 @@ endif()
 set(RESOURCE_ROOT .)
 if(APPLE)
   set(RESOURCE_ROOT Resources)
-  add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
 endif()
+add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
 
 if(NOT APPLE)
   set(rsrc_locations