Merge branch 'master' of github.com:DGtal-team/DGtal into PConvexity

DGtal-team · Jul 26, 2024 · 400024c · 400024c
2 parents e238904 + c159d34
commit 400024c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 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:
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
+        os: [ubuntu-latest, macOS-latest]
         python-version: ["3.9", "3.10", "3.11"]
         BUILD_TYPE: [Release]
 
@@ -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
@@ -88,13 +88,17 @@ jobs:
           sed -i '' "1s/.*/VERSION = '${{ github.ref_name }}'/" dgtalVersion.py
           cat dgtalVersion.py
 
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{runner.workspace}}/build
+
       - name: Deps on Windows
         if: matrix.os == 'windows-latest'
         shell: bash
         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'
         shell: bash

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,8 @@
 # DGtal 1.5beta
 
+
+# DGtal 1.4.1
+
 ## New features / critical changes
 
 - *Geometry*	
@@ -15,7 +18,6 @@
 
 
 ## Bug fixes
-
 - *General*
   - Fixing typos int the cmake script (David Coeurjolly, [#1739](https://github.com/DGtal-team/DGtal/pull/1739))
 

diff --git a/wrap/deploy/setup.py b/wrap/deploy/setup.py
@@ -23,7 +23,13 @@
     '-DDGTAL_WRAP_PYTHON:BOOL=ON'
 ]
 if sys.platform == "win32":
-    CMAKE_OPTIONS.append("-DENABLE_CONAN:BOOL=ON")
+    CMAKE_OPTIONS.append("-DENABLE_CONAN:BOOL=ON ")
+    CMAKE_OPTIONS.append(" -DENABLE_CONAN=true")
+    CMAKE_OPTIONS.append("-DCMAKE_C_COMPILER=\"cl.exe\"")
+    CMAKE_OPTIONS.append("-DCMAKE_CXX_COMPILER=\"cl.exe\"")
+    CMAKE_OPTIONS.append("-DCMAKE_TOOLCHAIN_FILE=\"conan_toolchain.cmake\"")
+    CMAKE_OPTIONS.append("-DCMAKE_POLICY_DEFAULT_CMP0091=NEW")
+
 
 
 # this_directory = path.abspath(path.dirname(__file__))