Fixing deploy pypi on windows

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

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/pythonBindings-Pypi.yml b/.github/workflows/pythonBindings-Pypi.yml
@@ -91,11 +91,10 @@ jobs:
       - name: Deps on Windows
         if: matrix.os == 'windows-latest'
         shell: bash
-        working-directory: ${{runner.workspace}}/build
+        working-directory: ${{runner.workspace}}
         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/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__))