Fixing github actions

DGtal-team · Jul 24, 2024 · c8c770b · c8c770b
1 parent f4c480a
commit c8c770b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/pythonBindings-PR.yml b/.github/workflows/pythonBindings-PR.yml
@@ -33,28 +33,28 @@ jobs:
         with: 
           python-version: ${{ matrix.python-version }}
 
-      - name: Installing dependancies (Linux)
+      - name: Installing dependencies (Linux)
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
           sudo apt-get install zsh libqglviewer-dev-qt5 libboost-dev libcgal-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libfftw3-dev libinsighttoolkit4-dev xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
       
-      - name: Installing dependancies (macOS)
+      - name: Installing dependencies (macOS)
         if: matrix.os == 'macOS-latest'
         run: brew install boost ninja gmp libomp ccache cgal
 
-      - name: Install dependancies (conan - Windows 1/2)
+      - name: Install dependencies (conan - Windows 1/2)
         if: matrix.os == 'windows-latest'
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
           version: 2.4.0
 
-      - name: Install dependancies (conan - Windows 2/2)
+      - name: Install dependencies (conan - Windows 2/2)
         if: matrix.os == 'windows-latest'
         run: |
           conan profile detect --force
-  
+
       - uses: actions/cache@v3
         if: matrix.os == 'windows-latest'
         with:

diff --git a/.github/workflows/pythonBindings-Pypi.yml b/.github/workflows/pythonBindings-Pypi.yml
@@ -12,7 +12,7 @@ env:
   CONFIG_GLOBAL: 
   CONFIG_LINUX:
   CONFIG_MAC:
-  CONFIG_WINDOWS:
+  CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe"
 
 jobs:
   build:
@@ -36,24 +36,24 @@ jobs:
         with: 
           python-version: ${{ matrix.python-version }}
 
-      - name: Installing dependancies (Linux)
+      - name: Installing dependencies (Linux)
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
           sudo apt-get install zsh libqglviewer-dev-qt5 libboost-dev libcgal-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libfftw3-dev libinsighttoolkit4-dev xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
       
-      - name: Installing dependancies (macOS)
+      - name: Installing dependencies (macOS)
         if: matrix.os == 'macOS-latest'
         run: brew install boost ninja gmp libomp ccache cgal
 
-      - name: Install dependancies (conan - Windows 1/2)
+      - name: Install dependencies (conan - Windows 1/2)
         if: matrix.os == 'windows-latest'
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
           version: 2.4.0
 
-      - name: Install dependancies (conan - Windows 2/2)
+      - name: Install dependencies (conan - Windows 2/2)
         if: matrix.os == 'windows-latest'
         run: |
           conan profile detect --force
@@ -94,6 +94,7 @@ jobs:
         working-directory: ${{runner.workspace}}/build
         run: |
               conan install $GITHUB_WORKSPACE --build=missing
+              cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_PYTHON $CONFIG_GLOBAL $CONFIG_WINDOWS
        
       - name: Setting build informations (Windows)
         if: matrix.os == 'windows-latest'