From 61b1a2a6f82d5923bb7a2c9314a5594fa473dc1f Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 7 Sep 2022 08:56:30 +0200
Subject: [PATCH] [wheel] Moved CMake options to preset.
---
CMakePresets.json | 14 ++++++++++++++
setup.py | 11 +----------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/CMakePresets.json b/CMakePresets.json
index 703fc056a2c..7bb0e9709bd 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -187,6 +187,20 @@
"OGS_USE_PYTHON": "OFF",
"OGS_USE_UNITY_BUILDS": "OFF"
}
+ },
+ {
+ "name": "wheel",
+ "inherits": "release",
+ "cacheVariables": {
+ "OGS_BUILD_PROCESSES": "LiquidFlow",
+ "OGS_BUILD_UTILS": "OFF",
+ "HDF5_USE_STATIC_LIBRARIES": "ON",
+ "OGS_BUILD_HDF5": "ON",
+ "OGS_USE_PYTHON": "OFF",
+ "OGS_BUILD_PYTHON_MODULE": "ON",
+ "OGS_BUILD_TESTING": "OFF",
+ "OGS_INSTALL_DEPENDENCIES": "OFF"
+ }
}
],
"buildPresets": [
diff --git a/setup.py b/setup.py
index f709460ae90..59908b1de0b 100644
--- a/setup.py
+++ b/setup.py
@@ -11,15 +11,6 @@ setup(
package_dir={"": "Applications/Python"},
cmake_install_dir="Applications/Python/OpenGeoSys",
extras_require={"test": ["pytest"]},
- cmake_args=[
- "-DOGS_BUILD_PROCESSES=LiquidFlow",
- "-DOGS_BUILD_UTILS=OFF",
- "-DHDF5_USE_STATIC_LIBRARIES=ON",
- "-DOGS_BUILD_HDF5=ON",
- "-DOGS_USE_PYTHON=OFF", # not possible because manylinux does not provide libpythonX.Y.so
- "-DOGS_BUILD_PYTHON_MODULE=ON",
- "-DOGS_BUILD_TESTING=OFF",
- "-DOGS_INSTALL_DEPENDENCIES=OFF", # otherwise auditwheel fails
- ],
+ cmake_args=["--preset wheel"],
python_requires=">=3.6",
)
--
GitLab