diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
index a67053cb..8ac8eec7 100644
--- a/.github/workflows/cmake-multi-platform.yml
+++ b/.github/workflows/cmake-multi-platform.yml
@@ -84,41 +84,21 @@ jobs:
     #   with:
     #     args: install mingw --version=8.1.0  -y
 
-    # - name: Install Qt
-    #   uses: jurplel/install-qt-action@v2
-    #   with:
-    #     host: windows
-    #     target: "desktop"
-    #     version: ${{ env.QT_VERSION }}
-    #     arch: ${{ env.MINGW_VERSION }}
-    #     dir: "${{github.workspace}}/qt"
-    #     install-deps: "true"
-
-    # - name: Set Qt path and refresh
-    #   run: |
-    #     echo "${{github.workspace}}/qt/Qt/${{ env.QT_VERSION }}/${{ env.MINGW_PATH }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-    #     refreshenv
-
     - name: Install LaTeX (Linux)
-      # if: matrix.os == 'ubuntu-latest'
       if: startsWith(matrix.os,'ubuntu-')
       run: |
         sudo apt update --fix-missing
         sudo apt upgrade
         sudo apt update
         sudo apt-get install texlive texlive-latex-recommended texlive-extra-utils texlive-latex-extra texlive-font-utils
-      # if: startsWith(matrix.config.os,'ubuntu-')
-      # if: ${{ startsWith(runner.os, 'ubuntu-') }}
       shell: bash
 
     - name: Install LaTeX (MacOS)
-      if: matrix.os == 'macos-latest'
+      if: startsWith(matrix.os,'macos-')
       run: |
         brew update
         brew install --cask mactex;
         echo "/Library/TeX/texbin/" >> $GITHUB_PATH
-      # if: matrix.config.os == 'macos-latest'
-      # if: ${{ startsWith(runner.os, 'macos-') }}
       shell: bash
 
     - name: Install LaTeX (Windows)
@@ -131,14 +111,23 @@ jobs:
           babel-dutch
           cjk
           bibtex
-      # if: matrix.config.os == 'windows-latest'
-      # if: ${{ startsWith(runner.os, 'windows-') }}
-      # shell: bash
 
-    - name: Install Doxygen (Ubuntu)
-      run: |
-        sudo apt-get install doxygen
-      if: startsWith(matrix.config.os,'ubuntu-')
+    - name:  Install Doxygen
+      run:   |
+         if [ "$RUNNER_OS" == "Linux" ]; then
+              sudo apt-get install doxygen
+         elif [ "$RUNNER_OS" == "Windows" ]; then
+              brew install doxygen
+         else
+              echo "$RUNNER_OS not supported"
+              # exit 1
+         fi
+      shell: bash
+
+    # - name: Install Doxygen (Ubuntu)
+    #   run: |
+    #     sudo apt-get install doxygen
+    #   if: startsWith(matrix.config.os,'ubuntu-')
 
     - name: Set reusable strings
       # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.