Merge pull request #417 from Universite-Gustave-Eiffel/folder_resources_rework

MacOS, Windows, Linux build

Author: nicolas-f

.github/workflows/flatpak.yml

@@ -27,8 +27,4 @@ jobs:
           cache-key: flatpak-builder-${{ github.sha }}
           arch: ${{ matrix.variant.arch }}
           verbose: true
-      - name: Upload Flatpak
-        uses: actions/upload-artifact@v4
-        with:
-          name: flatpak-${{ matrix.variant.arch }}
-          path: isimpa.flatpak
+

.github/workflows/sub_buildMacOS.yml

@@ -39,21 +39,19 @@ jobs:
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
         # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
         run: |
-          cmake -DCPM_SOURCE_CACHE=${{ env.CPM_SOURCE_CACHE }} -B "${{ env.builddir }}" -DCMAKE_BUILD_TYPE=Release
+          cmake -G Xcode -DCPM_SOURCE_CACHE=${{ env.CPM_SOURCE_CACHE }} -B "${{ env.builddir }}" -DCMAKE_BUILD_TYPE=Release -DTEAM_ID="${{ secrets.TEAMID }}"
       - name: Compiling sources
         run: |
           cmake --build "${{ env.builddir }}" --config Release
-      - name: Install
+      - name: Create distribution package
         run: |
-          cmake --install "${{ env.builddir }}" --config Release
-      - name: Test
-        working-directory: ${{github.workspace}}/build
-        # Execute tests defined by the CMake configuration.
-        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: make test
+          cpack -G DragNDrop
+        working-directory: ${{ env.builddir }}
       - name: Upload I-Simpa standalone
         uses: actions/upload-artifact@v4
         with:
-          name: macos-no-install-arm64
-          path: ${{ env.builddir }}/bin
+          name: macos_dmg
+          path: ${{ env.builddir }}/distribution/*.dmg
+
+
 

.github/workflows/sub_buildWindows.yml

@@ -118,9 +118,10 @@ jobs:
       - name: Compiling sources
         run: |
           cmake --build "${{ env.builddir }}" --config Release --parallel
-      - name: Install
+      - name: CPack
         run: |
-          cmake --install "${{ env.builddir }}" --config Release
+          cpack
+        working-directory: ${{ env.builddir }}
       - name: Print Ccache statistics after build
         run: |
           . $env:ccachebindir\ccache -s
@@ -136,4 +137,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: windows-no-install-x64
-          path: ${{ env.builddir }}/bin
+          path: ${{ env.builddir }}/src/isimpa
+      - name: Upload I-Simpa install
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-setup-x64
+          path: ${{ env.builddir }}/distribution/*.exe

.gitignore

@@ -56,3 +56,4 @@ CMakeSettings.json
 # pixi environments
 .pixi/*
 !.pixi/config.toml
+*.flatpak

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_policy(SET CMP0177 NEW) # install() DESTINATION paths are normalized
 cmake_policy(SET CMP0175 NEW)
 # Maps to a solution file (isimpa.sln). The solution will
 # have all targets (exe, lib, dll) as projects (.vcproj)
-project (isimpa VERSION 1.3.4)
+project (isimpa VERSION 1.4.0)
 
 # a better way to load dependencies
 include(cmake/CPM.cmake)