Isolate inference library deployment from CMake installation

Author: CrSjimo

cmake/DeployInference.cmake

@@ -36,29 +36,33 @@ function(dssp_deploy_inference_plugins target)
         endif()
     endforeach()
 
-    # srtsepinfer is built by this project. Staging must follow its target and
-    # re-run even when only the manifest changed or a deployed file was removed.
+    # Stage copies of project libraries and interpreters because deployment rewrites
+    # runtime paths. CMake installation requires the unmodified target binaries.
     set(_separation_destination "${_plugin_root}/srtsepinfer/inferenceinterpreters/demucs")
     add_custom_target(srtsepinfer_deploy_plugins
-        COMMAND "${CMAKE_COMMAND}" -E make_directory "${_separation_destination}"
+        COMMAND "${CMAKE_COMMAND}" -E make_directory "${_dependency_dir}" "${_separation_destination}"
+        COMMAND "${CMAKE_COMMAND}" -E copy_if_different
+            "$<TARGET_FILE:srtsepinfer>" "${_dependency_dir}/$<TARGET_FILE_NAME:srtsepinfer>"
         COMMAND "${CMAKE_COMMAND}" -E copy_if_different
             "$<TARGET_FILE:srtsepinferdemucs>" "${_separation_destination}/$<TARGET_FILE_NAME:srtsepinferdemucs>"
         COMMAND "${CMAKE_COMMAND}" -E copy_if_different
             "${SRTSEPINFER_PLUGIN_MANIFEST}" "${_separation_destination}/plugin.json"
-        DEPENDS srtsepinferdemucs "${SRTSEPINFER_PLUGIN_MANIFEST}"
-        COMMENT "Stage project-built srtsepinfer interpreter"
+        DEPENDS srtsepinfer srtsepinferdemucs "${SRTSEPINFER_PLUGIN_MANIFEST}"
+        COMMENT "Stage project-built srtsepinfer library and interpreter"
         VERBATIM
     )
 
     add_dependencies(${target} srtsepinfer_deploy_plugins)
 
     set(_beat_destination "${_plugin_root}/srtbeatinfer/inferenceinterpreters/beat-this")
     add_custom_target(srtbeatinfer_deploy_plugins
-        COMMAND "${CMAKE_COMMAND}" -E make_directory "${_beat_destination}"
+        COMMAND "${CMAKE_COMMAND}" -E make_directory "${_dependency_dir}" "${_beat_destination}"
+        COMMAND "${CMAKE_COMMAND}" -E copy_if_different
+            "$<TARGET_FILE:srtbeatinfer>" "${_dependency_dir}/$<TARGET_FILE_NAME:srtbeatinfer>"
         COMMAND "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:srtbeatinferbeatthis>" "${_beat_destination}/$<TARGET_FILE_NAME:srtbeatinferbeatthis>"
         COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${SRTBEATINFER_PLUGIN_MANIFEST}" "${_beat_destination}/plugin.json"
-        DEPENDS srtbeatinferbeatthis "${SRTBEATINFER_PLUGIN_MANIFEST}"
-        COMMENT "Stage project-built srtbeatinfer interpreter"
+        DEPENDS srtbeatinfer srtbeatinferbeatthis "${SRTBEATINFER_PLUGIN_MANIFEST}"
+        COMMENT "Stage project-built srtbeatinfer library and interpreter"
         VERBATIM)
 
     add_dependencies(${target} srtbeatinfer_deploy_plugins)

src/libs/3rdparty/srtbeatinfer/CMakeLists.txt

@@ -12,10 +12,11 @@ target_link_libraries(srtbeatinfer PUBLIC synthrt::synthrt)
 target_include_directories(srtbeatinfer PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
 
 generate_export_header(srtbeatinfer EXPORT_FILE_NAME "include/srtbeatinfer/export.h")
+# Deployment rewrites runtime paths. Retain the original binary for CMake installation.
 set_target_properties(srtbeatinfer PROPERTIES
     OUTPUT_NAME synthrt-srtbeatinfer
-    RUNTIME_OUTPUT_DIRECTORY "${DSSP_BUILD_RUNTIME_DIR}"
-    LIBRARY_OUTPUT_DIRECTORY "${DSSP_BUILD_LIBRARY_DIR}"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/runtime/$<CONFIG>"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/runtime/$<CONFIG>"
 )
 
 add_library(srtbeatinfer_dsp STATIC src/BeatFeatures.cpp)

src/libs/3rdparty/srtsepinfer/CMakeLists.txt

@@ -16,10 +16,11 @@ target_include_directories(srtsepinfer PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
 
 generate_export_header(srtsepinfer EXPORT_FILE_NAME "include/srtsepinfer/export.h")
+# Deployment rewrites runtime paths. Retain the original binary for CMake installation.
 set_target_properties(srtsepinfer PROPERTIES
     OUTPUT_NAME synthrt-srtsepinfer
-    RUNTIME_OUTPUT_DIRECTORY "${DSSP_BUILD_RUNTIME_DIR}"
-    LIBRARY_OUTPUT_DIRECTORY "${DSSP_BUILD_LIBRARY_DIR}")
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/runtime/$<CONFIG>"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/runtime/$<CONFIG>")
 
 add_library(srtsepinfer_dsp STATIC src/SpectralTransform.cpp)
 target_compile_features(srtsepinfer_dsp PUBLIC cxx_std_23)