Refresh macos support

* Updated to Qt6
* Added pandoc dependency
* Updated macos versions in actions

Author: DorianGerardin

.github/workflows/CI-macos.yaml

@@ -12,15 +12,23 @@ jobs:
   ci-macos-debug:
     strategy:
       matrix:
-        os: [macos-13]
+        os: [macos-13, macos-14, macos-15]
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Installation of dependencies
         run: | 
           brew install \
-            boost gdal curl qt6 \
-            gnuplot
+          boost gdal curl qt6 \
+          gnuplot
+      - name: Installation of pandoc
+        uses: r-lib/actions/setup-pandoc@v2
+      - name: Installation of latex
+        uses: teatimeguest/setup-texlive-action@v3
+        with:
+          packages: |
+            scheme-full
+            bibtex
       - name: Checkout of source code
         uses: actions/checkout@v3
       - name: Preparation
@@ -32,7 +40,7 @@ jobs:
         working-directory: ./_build
       - name: Build
         run: make -j 2
-        working-directory: ./_build
+        working-directory: ./_build      
       - name: Testing
         run: ctest --output-on-failure
         working-directory: ./_build
@@ -44,15 +52,17 @@ jobs:
   ci-macos-release:
     strategy:
       matrix:
-        os: [macos-13]
+        os: [macos-13, macos-14, macos-15]
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Installation of dependencies
         run: | 
           brew install \
-            boost gdal curl qt6 \
-            gnuplot
+          boost gdal curl qt6 \
+          gnuplot
+      - name: Installation of pandoc
+        uses: r-lib/actions/setup-pandoc@v2
       - name: Checkout of source code
         uses: actions/checkout@v3
       - name: Preparation

.github/workflows/macos-packaging.yaml

@@ -10,32 +10,31 @@ on:
 
 
 jobs:
+
   build-packaging:
     strategy:
       matrix:
-        os: [macos-10.15,macos-11,macos-12]
+        os: [macos-13, macos-14, macos-15]
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.inputs.reference }}
-
       - name: Installation of dependencies
         run: |
           brew update
           brew install \
-            boost gdal qt5 \
-            doxygen gnuplot doxygen
+          boost gdal curl qt6 \
+          gnuplot
+
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: Preparation
         run: |
-          echo "$(brew --prefix qt5)/bin" >> $GITHUB_PATH
-          mkdir ./_build && ls
+          echo "$(brew --prefix qt6)/bin" >> $GITHUB_PATH
+          mkdir ./_build
 
       - name: Configuration
-        run: cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix qt5)/lib/cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local
+        run: cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix qt6)/lib/cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local
         working-directory: ./_build
 
       - name: Build
@@ -49,7 +48,7 @@ jobs:
         working-directory: ./_build
 
       - name: Uploading artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with: 
           name: ${{ matrix.os }}_${{ github.event.inputs.reference }}
           path: ./_build/_osx_brewcask/openfluid*

cmake/internal/OpenFLUIDSystemInfo.cmake

@@ -150,24 +150,16 @@ IF(UNIX AND NOT CYGWIN)
 
     EXECUTE_PROCESS(COMMAND "sw_vers" "-productVersion" OUTPUT_VARIABLE OFBUILD_SYSTEM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    IF(${OFBUILD_SYSTEM_VERSION} MATCHES "12\..*")
+    IF(${OFBUILD_SYSTEM_VERSION} MATCHES "15\..*")
+      SET(OFBUILD_SYSTEM_CODE "sequoia")
+    ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "14\..*")
+      SET(OFBUILD_SYSTEM_CODE "sonoma")
+    ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "13\..*")
+      SET(OFBUILD_SYSTEM_CODE "ventura")
+    ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "12\..*")
       SET(OFBUILD_SYSTEM_CODE "monterey")
     ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "11\..*")
       SET(OFBUILD_SYSTEM_CODE "big_sur")
-    ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "10\.15.*")
-      SET(OFBUILD_SYSTEM_CODE "catalina")
-    ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "10\.14.*")
-      SET(OFBUILD_SYSTEM_CODE "mojave")
-    ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "10\.13.*")
-      SET(OFBUILD_SYSTEM_CODE "high_sierra")
-    ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "10\.12.*")
-      SET(OFBUILD_SYSTEM_CODE "sierra")
-    ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "10\.11.*")
-      SET(OFBUILD_SYSTEM_CODE "el_capitan")
-    ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "10\.10.*")
-      SET(OFBUILD_SYSTEM_CODE "yosemite")
-    ELSEIF(${OFBUILD_SYSTEM_VERSION} MATCHES "10\.9.*")
-      SET(OFBUILD_SYSTEM_CODE "mavericks")
     ENDIF() 
   ENDIF()
 ENDIF()

resources/packaging/macosx/openfluid.rb.in

@@ -16,14 +16,15 @@ cask 'openfluid@TOKEN_VERSION@' do
   # external dependencies
   depends_on formula: 'boost'
   depends_on formula: 'gdal'
-  depends_on formula: 'qt5'
+  depends_on formula: 'qt6'
   depends_on formula: 'p7zip'
   depends_on formula: 'gnuplot'
   depends_on formula: 'cmake'
+  depends_on formula: 'pandoc'
 
 
   # system dependencies
-  depends_on macos: '>= :yosemite'
+  depends_on macos: '>= :big_sur'
 
 
   # variables used during installation process