]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
Dépendance à LIBBATCH limitée à Linux
authorGilles DAVID <gilles-g.david@edf.fr>
Wed, 30 Oct 2024 09:40:15 +0000 (10:40 +0100)
committerGilles DAVID <gilles-g.david@edf.fr>
Wed, 30 Oct 2024 09:40:15 +0000 (10:40 +0100)
pyproject.toml
requirements.txt

index 370c79b2d11fff28643fe6972d4210cfd61f8c51..3cd9648649ed363114c1cccfbcfea66c8e0bf684 100644 (file)
@@ -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"
index 0ffc6eaed195f1677cea0e9bcbdde41e32316403..e081001be95a27afda7b0c68fb519c77875f7995 100644 (file)
@@ -4,4 +4,4 @@ setuptools_scm
 build
 omniorb
 salome_conf
-libbatch
+libbatch; platform_system!= 'Windows'