From c9c20597f408603f030bc566b089f20e015adfcb Mon Sep 17 00:00:00 2001 From: Gilles DAVID Date: Wed, 30 Oct 2024 10:40:15 +0100 Subject: [PATCH] =?utf8?q?D=C3=A9pendance=20=C3=A0=20LIBBATCH=20limit?= =?utf8?q?=C3=A9e=20=C3=A0=20Linux?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 15 ++++++++++----- requirements.txt | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 370c79b2d..3cd964864 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,8 @@ [build-system] requires = [ "scikit-build-core", - "omniorb", - "libbatch", + "omniorb>=4.2.2", + "libbatch>=2.5.1; platform_system!= 'Windows'", "salome_conf", ] build-backend = "scikit_build_core.build" @@ -14,8 +14,8 @@ readme = {file = "README", content-type = "text/markdown"} requires-python = ">= 3.7" license = {file = "COPYING"} dependencies = [ - "omniorb", - "libbatch", + "omniorb>=4.2.2", + "libbatch>=2.5.1; platform_system!= 'Windows'", "psutil", "numpy", ] @@ -28,7 +28,6 @@ scipy = ["scipy"] # SALOME_CMAKE_DEBUG = "ON" RELOCATABLE = "ON" SALOME_BUILD_TESTS = "ON" -SALOME_USE_LIBBATCH = "ON" SALOME_USE_64BIT_IDS = "ON" SALOME_BUILD_DOC = "OFF" @@ -36,6 +35,12 @@ OMNIORBPY_ROOT_DIR = {env="VIRTUAL_ENV", default="EMPTY"} LIBBATCH_ROOT_DIR = {env="VIRTUAL_ENV", default="EMPTY"} CONFIGURATION_ROOT_DIR = {env="VIRTUAL_ENV", default="EMPTY"} +# Activate Libbatch on Linux +[[tool.scikit-build.overrides]] +if.platform-system = "linux" +inherit.cmake.define = "append" +cmake.define.SALOME_USE_LIBBATCH = "ON" + [tool.scikit-build] cmake.version = ">=3.15" cmake.build-type = "Release" diff --git a/requirements.txt b/requirements.txt index 0ffc6eaed..e081001be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ setuptools_scm build omniorb salome_conf -libbatch +libbatch; platform_system!= 'Windows' -- 2.39.2