Prise en compte de omnorb, salome_conf et libbatch en mode wheel

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b87f6e1a4f37bea73444f37ff879717e5a1927e0..eb2406b59b55f134f187003776c5472e5a55fa96 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,11 @@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 # ===================
 SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
 IF(EXISTS ${CONFIGURATION_ROOT_DIR})
+if(${SKBUILD})
+  LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/share/salome_conf/cmake")
+else(${SKBUILD})
   LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
+endif(${SKBUILD})
   INCLUDE(SalomeMacros NO_POLICY_SCOPE)
 ELSE()
   MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 2c2eb57de17963ed187e1191f17ea5e0b0eec795..eaeef588d875d066bdfd3f91d9fe58b1963a902a 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -17,7 +17,11 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${CONFIGURATION_ROOT_DIR}/cmake/UseOmniORB.cmake)
+if(${SKBUILD})
+  INCLUDE(${CONFIGURATION_ROOT_DIR}/share/salome_conf/cmake/UseOmniORB.cmake)
+else(${SKBUILD})
+  INCLUDE(${CONFIGURATION_ROOT_DIR}/cmake/UseOmniORB.cmake)
+endif(${SKBUILD})
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}

diff --git a/pyproject.toml b/pyproject.toml
index ed8863424391a5ad183d6cb4c885f55e2393bd48..370c79b2d11fff28643fe6972d4210cfd61f8c51 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,10 @@
 [build-system]
-requires = ["scikit-build-core"]
+requires = [
+  "scikit-build-core",
+  "omniorb",
+  "libbatch",
+  "salome_conf",
+]
 build-backend = "scikit_build_core.build"
 
 [project]
@@ -9,8 +14,8 @@ readme = {file = "README", content-type = "text/markdown"}
 requires-python = ">= 3.7"
 license = {file = "COPYING"}
 dependencies = [
-  # Uncomment when omniorbpy wheel is published
-  # "omniorbpy",
+  "omniorb",
+  "libbatch",
   "psutil",
   "numpy",
 ]
@@ -20,15 +25,16 @@ dynamic = ["version"]
 scipy = ["scipy"]
 
 [tool.scikit-build.cmake.define]
+# SALOME_CMAKE_DEBUG = "ON"
 RELOCATABLE = "ON"
 SALOME_BUILD_TESTS = "ON"
 SALOME_USE_LIBBATCH = "ON"
 SALOME_USE_64BIT_IDS = "ON"
 SALOME_BUILD_DOC = "OFF"
 
-OMNIORBPY_ROOT_DIR = {env="OMNIORBPY_DIR", default="EMPTY"}
-LIBBATCH_ROOT_DIR = {env="LIBBATCH_ROOT_DIR", default="EMPTY"}
-CMAKE_MODULE_PATH = {env="CONFIGURATION_CMAKE_DIR", default="EMPTY"}
+OMNIORBPY_ROOT_DIR = {env="VIRTUAL_ENV", default="EMPTY"}
+LIBBATCH_ROOT_DIR = {env="VIRTUAL_ENV", default="EMPTY"}
+CONFIGURATION_ROOT_DIR = {env="VIRTUAL_ENV", default="EMPTY"}
 
 [tool.scikit-build]
 cmake.version = ">=3.15"

diff --git a/requirements.txt b/requirements.txt
index e778fc0aa1800980c408994e945d21b84d9ed18d..0ffc6eaed195f1677cea0e9bcbdde41e32316403 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,7 @@
 ninja>=1.5
 scikit-build-core
 setuptools_scm
-build
\ No newline at end of file
+build
+omniorb
+salome_conf
+libbatch