From f549f10f9de8e18df404e78834e0d2b308e063bf Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 27 Apr 2023 14:14:26 +0200
Subject: [PATCH] [wheel,ci] Fix Windows build.
---
pyproject.toml | 3 +++
scripts/ci/jobs/build-wheels.yml | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 8e6c23424ff..14be11063af 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -80,6 +80,9 @@ skip = ["cp36-*", "cp37-*"]
[tool.cibuildwheel.windows.config-settings]
"cmake.define.OGS_USE_MFRONT" = "OFF"
"cmake.define.OGS_BUILD_PROCESS_TH2M" = "OFF"
+# Generator needs to be set here, CMAKE_GENERATOR env var does not work.
+# Ninja generator does not select the host64 compiler.
+"cmake.args" = "-G;Visual Studio 16 2019;--preset;wheel"
[tool.ruff]
select = [
diff --git a/scripts/ci/jobs/build-wheels.yml b/scripts/ci/jobs/build-wheels.yml
index 305644165b3..fa1c7d1b1bd 100644
--- a/scripts/ci/jobs/build-wheels.yml
+++ b/scripts/ci/jobs/build-wheels.yml
@@ -57,9 +57,6 @@ build wheels win:
- .vs2019-environment
variables:
SKBUILD_BUILD_OPTIONS: "/m" # TODO not supported yet in scikit-build-core
- CMAKE_GENERATOR: "Visual Studio 16 2019"
- # Does not work as it does not select the host64 compiler:
- # SKBUILD_GENERATOR: "Ninja"
<<: *wheels_template
publish wheels:
--
GitLab