build: auto-resolve staged outputs from TARGET_LIBS imported locations

Replace USE_FLAG_FILE with proper output tracking for TARGET_LIBS:
the staging macro now resolves IMPORTED_LOCATION at configure time to
derive output filenames, so Ninja detects deleted staged files and
re-runs the staging command automatically. Falls back to flag file
if location cannot be resolved.

Also convert dav1d, ffmpeg, and ocio from LIB_DIR copy-directory
staging to TARGET_LIBS for the same incremental-build benefit.

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>

Author: cedrik-fuoco-adsk

cmake/dependencies/boost.cmake

@@ -186,5 +186,5 @@ ELSE()
   ENDFOREACH()
 
   # Found path: actual filenames may differ (e.g. -mt suffix), use TARGET_LIBS to resolve at build time
-  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS ${_boost_deps_list_targets} USE_FLAG_FILE)
+  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS ${_boost_deps_list_targets})
 ENDIF()

cmake/dependencies/dav1d.cmake

@@ -94,11 +94,7 @@ ELSE()
 ENDIF()
 
 # --- Staging ---
-IF(RV_TARGET_WINDOWS)
-  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} BIN_DIR ${_bin_dir} USE_FLAG_FILE)
-ELSE()
-  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} USE_FLAG_FILE)
-ENDIF()
+RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS dav1d::dav1d)
 
 # --- FFmpeg customization adding dav1d codec support ---
 SET_PROPERTY(

cmake/dependencies/ffmpeg.cmake

@@ -410,13 +410,15 @@ ADD_CUSTOM_TARGET(
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${RV_DEPS_BASE_DIR}/cmake/dependencies/${_target}-prefix
 )
 
-# Note: On Windows, FFmpeg stores both import libs and DLLs in the install bin directory, so we copy _lib_dir (which is install/bin on Windows) to both stage
-# dirs.
-IF(RV_TARGET_WINDOWS)
-  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} EXTRA_LIB_DIRS ${RV_STAGE_BIN_DIR} USE_FLAG_FILE)
-ELSE()
-  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} USE_FLAG_FILE)
-ENDIF()
+SET(_ffmpeg_targets)
+FOREACH(
+  _ffmpeg_lib
+  ${_ffmpeg_libs}
+)
+  LIST(APPEND _ffmpeg_targets ffmpeg::${_ffmpeg_lib})
+ENDFOREACH()
+
+RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS ${_ffmpeg_targets})
 
 SET(RV_DEPS_FFMPEG_VERSION
     ${_version}

cmake/dependencies/glew.cmake

@@ -48,5 +48,5 @@ ELSE()
   ENDIF()
 
   # Found path: use TARGET_LIBS to resolve actual library path at build time
-  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS GLEW::GLEW USE_FLAG_FILE)
+  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS GLEW::GLEW)
 ENDIF()

cmake/dependencies/ocio.cmake

@@ -319,8 +319,6 @@ IF(RV_TARGET_WINDOWS)
   ENDIF()
 ENDIF()
 
-RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} BIN_DIR ${_bin_dir} USE_FLAG_FILE)
-
 RV_ADD_IMPORTED_LIBRARY(
   NAME
   OpenColorIO::OpenColorIO
@@ -336,3 +334,5 @@ RV_ADD_IMPORTED_LIBRARY(
   ${_target}
   ADD_TO_DEPS_LIST
 )
+
+RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS OpenColorIO::OpenColorIO)

cmake/dependencies/openexr.cmake

@@ -169,5 +169,5 @@ ELSE()
     LIST(APPEND _openexr_stage_targets OpenEXR::OpenEXRCore)
   ENDIF()
 
-  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS ${_openexr_stage_targets} USE_FLAG_FILE)
+  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS ${_openexr_stage_targets})
 ENDIF()

cmake/dependencies/openssl.cmake

@@ -180,7 +180,6 @@ ELSE()
       TARGET_LIBS
       OpenSSL::Crypto
       OpenSSL::SSL
-      USE_FLAG_FILE
     )
   ENDIF()
 

cmake/dependencies/zlib.cmake

@@ -160,7 +160,7 @@ ELSE()
     )
     ADD_DEPENDENCIES(dependencies ${_target}-stage-target)
   ELSE()
-    RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS ZLIB::ZLIB USE_FLAG_FILE)
+    RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} TARGET_LIBS ZLIB::ZLIB)
   ENDIF()
 ENDIF()
 

cmake/macros/rv_stage_dependency_libs.cmake

@@ -20,8 +20,10 @@
 #     [STAGE_LIB_DIR <override>]    # Override RV_STAGE_LIB_DIR (e.g., for OpenSSL/Linux)
 #     [EXTRA_LIB_DIRS <dir1>...]    # Additional lib dirs to copy to
 #     [FILES <file1> [file2...]]    # Individual files to copy_if_different to STAGE_LIB_DIR (alternative to LIB_DIR)
-#     [TARGET_LIBS <t1> [t2...]]    # Imported targets to stage via $<TARGET_FILE:...> generatos (requires USE_FLAG_FILE).
-#                                   # Resolves actual library paths at build time — handles any naming convention.
+#     [TARGET_LIBS <t1> [t2...]]    # Imported targets to stage via $<TARGET_FILE:...> generators.
+#                                   # At configure time, resolves IMPORTED_LOCATION to derive output filenames
+#                                   # for proper incremental tracking (re-stages if files are deleted).
+#                                   # Falls back to USE_FLAG_FILE if location cannot be resolved.
 #                                   # On Windows: DLL→STAGE_BIN_DIR, import lib→STAGE_LIB_DIR.
 #     [DEPENDS <dep1> [dep2...]]    # Dependencies (default: ${TARGET})
 #     [PRE_COMMANDS COMMAND <cmd1> [COMMAND <cmd2>...]]  # Commands to run before copy; each must be prefixed with COMMAND keyword
@@ -71,13 +73,6 @@ FUNCTION(RV_STAGE_DEPENDENCY_LIBS)
     ENDIF()
   ENDIF()
 
-  # Validate TARGET_LIBS requires USE_FLAG_FILE (generators can't be used in OUTPUTS)
-  IF(_ARG_TARGET_LIBS
-     AND NOT _ARG_USE_FLAG_FILE
-  )
-    MESSAGE(FATAL_ERROR "RV_STAGE_DEPENDENCY_LIBS: TARGET_LIBS requires USE_FLAG_FILE (generator expressions cannot be used in OUTPUTS)")
-  ENDIF()
-
   # Default LIB_DIR to caller's _lib_dir if not explicitly passed
   IF(NOT _ARG_LIB_DIR
      AND NOT _ARG_FILES
@@ -111,6 +106,68 @@ FUNCTION(RV_STAGE_DEPENDENCY_LIBS)
     )
   ENDIF()
 
+  # When TARGET_LIBS is used without explicit USE_FLAG_FILE or OUTPUTS, resolve IMPORTED_LOCATION at configure time to derive output filenames for proper
+  # incremental tracking. This way Ninja detects deleted staged files and re-runs the staging command automatically.
+  IF(_ARG_TARGET_LIBS
+     AND NOT _ARG_USE_FLAG_FILE
+     AND NOT _ARG_OUTPUTS
+  )
+    SET(_rsdl_resolved_outputs)
+    SET(_rsdl_failed
+        FALSE
+    )
+    STRING(TOUPPER "${CMAKE_BUILD_TYPE}" _rsdl_config_upper)
+
+    FOREACH(
+      _rsdl_tgt
+      ${_ARG_TARGET_LIBS}
+    )
+      RV_RESOLVE_IMPORTED_LOCATION(${_rsdl_tgt} _rsdl_loc)
+
+      IF(_rsdl_loc)
+        GET_FILENAME_COMPONENT(_rsdl_fname "${_rsdl_loc}" NAME)
+        IF(RV_TARGET_WINDOWS)
+          LIST(APPEND _rsdl_resolved_outputs "${RV_STAGE_BIN_DIR}/${_rsdl_fname}")
+          SET(_rsdl_implib
+              ""
+          )
+          FOREACH(
+            _rsdl_prop
+            IMPORTED_IMPLIB IMPORTED_IMPLIB_${_rsdl_config_upper} IMPORTED_IMPLIB_RELEASE IMPORTED_IMPLIB_NOCONFIG
+          )
+            IF(NOT _rsdl_implib)
+              GET_TARGET_PROPERTY(_rsdl_implib ${_rsdl_tgt} ${_rsdl_prop})
+            ENDIF()
+          ENDFOREACH()
+          IF(_rsdl_implib)
+            GET_FILENAME_COMPONENT(_rsdl_impfname "${_rsdl_implib}" NAME)
+            LIST(APPEND _rsdl_resolved_outputs "${_ARG_STAGE_LIB_DIR}/${_rsdl_impfname}")
+          ENDIF()
+        ELSE()
+          LIST(APPEND _rsdl_resolved_outputs "${_ARG_STAGE_LIB_DIR}/${_rsdl_fname}")
+        ENDIF()
+      ELSE()
+        SET(_rsdl_failed
+            TRUE
+        )
+        MESSAGE(AUTHOR_WARNING "RV_STAGE_DEPENDENCY_LIBS: Cannot resolve IMPORTED_LOCATION for ${_rsdl_tgt}; falling back to flag file")
+        BREAK()
+      ENDIF()
+    ENDFOREACH()
+
+    IF(NOT _rsdl_failed
+       AND _rsdl_resolved_outputs
+    )
+      SET(_ARG_OUTPUTS
+          ${_rsdl_resolved_outputs}
+      )
+    ELSE()
+      SET(_ARG_USE_FLAG_FILE
+          TRUE
+      )
+    ENDIF()
+  ENDIF()
+
   # Build the command list
   SET(_commands)