gnucash-docs maint: Apply source/dest figure dependencies to AddXdgHelpTarget.

John Ralls jralls at code.gnucash.org
Thu Sep 8 19:22:09 EDT 2022


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/a8c855a8 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/e803940d (commit)



commit a8c855a80ea119c003cafd1e6a9e1db262694aec
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Sep 8 16:21:14 2022 -0700

    Apply source/dest figure dependencies to AddXdgHelpTarget.

diff --git a/cmake/AddXdgHelpTarget.cmake b/cmake/AddXdgHelpTarget.cmake
index ad155da6..b9bb53af 100644
--- a/cmake/AddXdgHelpTarget.cmake
+++ b/cmake/AddXdgHelpTarget.cmake
@@ -43,16 +43,26 @@ function (add_xdghelp_target docname lang entities figures)
         WORKING_DIRECTORY "${BUILD_DIR}")
 
     # Copy figures for this document
-    add_custom_command(
-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/xdghelp_figtrigger"
-        COMMAND ${CMAKE_COMMAND} -E copy ${figures} "${BUILD_DIR}/figures"
-        COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/xdghelp_figtrigger"
-        DEPENDS ${figures} "${CMAKE_CURRENT_BINARY_DIR}/xdghelptrigger")
+    set(source_figures "")
+    foreach(figure ${figures})
+        list(APPEND source_figures "${CMAKE_CURRENT_SOURCE_DIR}/${figure}")
+    endforeach()
+
+    set(dest_figures "")
+    foreach(figure ${figures})
+        list(APPEND dest_figures "${BUILD_DIR}/${figure}")
+    endforeach()
+
+    if(dest_figures)
+        add_custom_command(
+            OUTPUT ${dest_figures}
+            COMMAND ${CMAKE_COMMAND} -E copy ${source_figures} "${BUILD_DIR}/figures"
+            DEPENDS ${source_figures} "${CMAKE_CURRENT_BINARY_DIR}/xdghelptrigger")
+    endif()
 
     add_custom_target("${lang}-${docname}-xdghelp"
         DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/xdghelptrigger"
-                 ${dest_files}
-                "${CMAKE_CURRENT_BINARY_DIR}/xdghelp_figtrigger")
+                 ${dest_files} ${dest_figures})
 
     add_dependencies(${docname}-xdghelp "${lang}-${docname}-xdghelp")
 



Summary of changes:
 cmake/AddXdgHelpTarget.cmake | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)



More information about the gnucash-changes mailing list