Fixing documentation build on Ubuntu-24.04.

.github/workflows/actions_build.yml

@@ -191,6 +191,11 @@ jobs:
       shell: bash
       run: ctest -V 
 
+    - name: Documentation
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: make doc_comms       
+
   build_clang_old_ubuntu_20_04:
     runs-on: ubuntu-20.04
     strategy:
@@ -380,6 +385,11 @@ jobs:
       shell: bash
       run: ctest -V 
 
+    - name: Documentation
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: make doc_comms 
+
   build_msvc_2019:
     runs-on: windows-2019
     strategy:

CMakeLists.txt

@@ -102,14 +102,21 @@ set (LIB_COMMS_CMAKE_FILES
 find_package (Doxygen)
 if (DOXYGEN_FOUND)
     set (doc_output_dir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/doc/comms")
-
-    set (match_str "OUTPUT_DIRECTORY[^\n]*")
-    set (replacement_str "OUTPUT_DIRECTORY = ${doc_output_dir}")
     set (output_file "${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf")
 
+    set (out_dir_match_str "OUTPUT_DIRECTORY[^\n]*")
+    set (out_dir_replacement_str "OUTPUT_DIRECTORY = ${doc_output_dir}")
+
     set (config_file "${CMAKE_CURRENT_SOURCE_DIR}/doxygen/doxygen.conf")
     file (READ ${config_file} config_text)
-    string (REGEX REPLACE "${match_str}" "${replacement_str}" modified_config_text "${config_text}")
+    string (REGEX REPLACE "${out_dir_match_str}" "${out_dir_replacement_str}" modified_config_text "${config_text}")
+
+    if (UNIX)
+        set (dia_path_match_str "DIA_PATH[^\n]*")
+        set (dia_path_replacement_str "DIA_PATH = ${PROJECT_SOURCE_DIR}/script")
+        string (REGEX REPLACE "${dia_path_match_str}" "${dia_path_replacement_str}" modified_config_text "${modified_config_text}")
+    endif ()
+
     file (WRITE "${output_file}" "${modified_config_text}")
 
     add_custom_target ("doc_comms"

script/dia

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Replacement of "dia" on Linux, because doxygen hardcodes "-t png-libart" parameters while "dia" doesn't have this filter any more
+
+MISSING_FILTER="png-libart"
+REPLACEMENT_FILTER="cairo-png"
+DIA_PATH="/usr/bin/dia"
+
+###########################################
+
+has_requested_filter=$(${DIA_PATH} --list-filters 2>/dev/null | grep ${MISSING_FILTER})
+if [ -n "${has_requested_filter}" ]; then
+    exec ${DIA_PATH} "$@"
+    exit 0
+fi
+
+new_params=()
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        -t)
+            # If the current argument is "-t", shift and check the next argument
+            shift
+            if [ "$1" == "${MISSING_FILTER}" ]; then
+                new_params+=("-t" "${REPLACEMENT_FILTER}")
+            else
+                new_params+=("-t" "$1")
+            fi
+            ;;
+        *)
+            # For all other arguments, just add them to the array
+            new_params+=("$1")
+            ;;
+    esac
+    shift
+done
+
+echo "!!! Invoking ${DIA_PATH} ${new_params[@]}"
+exec ${DIA_PATH} "${new_params[@]}"