23308: [EDF] Re-implement DISTENE meshing plugins to use libraries instead of executables

diff --git a/cmake/FindMESHGEMS.cmake b/cmake/FindMESHGEMS.cmake
index 2e62b45608d29a718de79a7941866292db477550..9422b1f30dd27c26b5a6c28463c16857da63b221 100644 (file)
--- a/cmake/FindMESHGEMS.cmake
+++ b/cmake/FindMESHGEMS.cmake
@@ -20,7 +20,11 @@
 # - Find MESHGEMS
 # Sets the following variables:
 #   MESHGEMS_INCLUDE_DIRS - path to the MESHGEMS include directory
-#   MESHGEMS_LIBRARIES    - path to the MESHGEMS libraries to be linked against
+#   MESHGEMS_CADSURF_LIBRARY   - paths to the MESHGEMS libraries to be linked against
+#   MESHGEMS_HEXA_LIBRARY
+#   MESHGEMS_HYBRID_LIBRARY
+#   MESHGEMS_TETRA_LIBRARY
+#   MESHGEMS_TETRA_HPC_LIBRARY
 
 # ------
 
@@ -47,15 +51,24 @@ ELSE()
   SET(_plt Linux${_suff})
 ENDIF(WIN32)
 
-FIND_LIBRARY(MESHGEMS_LIBRARY_mg-cadsurf NAMES mg-cadsurf PATH_SUFFIXES ${_plt})
-FIND_LIBRARY(MESHGEMS_LIBRARY_meshgems NAMES meshgems PATH_SUFFIXES ${_plt})
+FIND_LIBRARY(MESHGEMS_LIB_meshgems       NAMES meshgems       PATH_SUFFIXES ${_plt})
+FIND_LIBRARY(MESHGEMS_LIB_meshgems_stubs NAMES meshgems_stubs PATH_SUFFIXES ${_plt})
+FIND_LIBRARY(MESHGEMS_CADSURF_LIBRARY    NAMES mg-cadsurf     PATH_SUFFIXES ${_plt})
+FIND_LIBRARY(MESHGEMS_HEXA_LIBRARY       NAMES mg-hexa        PATH_SUFFIXES ${_plt})
+FIND_LIBRARY(MESHGEMS_HYBRID_LIBRARY     NAMES mg-hybrid      PATH_SUFFIXES ${_plt})
+FIND_LIBRARY(MESHGEMS_TETRA_LIBRARY      NAMES mg-tetra       PATH_SUFFIXES ${_plt})
+FIND_LIBRARY(MESHGEMS_TETRA_HPC_LIBRARY  NAMES mg-tetra_hpc   PATH_SUFFIXES ${_plt})
 
 # TODO: search all components
-SET(MESHGEMS_LIBRARIES)
-SET(MESHGEMS_LIBRARIES ${MESHGEMS_LIBRARIES} ${MESHGEMS_LIBRARY_mg-cadsurf})
 IF(MESHGEMS_LIBRARY_meshgems)
-  SET(MESHGEMS_LIBRARIES ${MESHGEMS_LIBRARIES} ${MESHGEMS_LIBRARY_meshgems})
+  SET(MESHGEMS_LIBRARY_meshgems  ${MESHGEMS_LIBRARY_meshgems}  ${MESHGEMS_LIB_meshgems_stubs})
+
+  SET(MESHGEMS_CADSURF_LIBRARY   ${MESHGEMS_CADSURF_LIBRARY}   ${MESHGEMS_LIBRARY_meshgems})
+  SET(MESHGEMS_HEXA_LIBRARY      ${MESHGEMS_HEXA_LIBRARY}      ${MESHGEMS_LIBRARY_meshgems})
+  SET(MESHGEMS_HYBRID_LIBRARY    ${MESHGEMS_HYBRID_LIBRARY}    ${MESHGEMS_LIBRARY_meshgems})
+  SET(MESHGEMS_TETRA_LIBRARY     ${MESHGEMS_TETRA_LIBRARY}     ${MESHGEMS_LIBRARY_meshgems})
+  SET(MESHGEMS_TETRA_HPC_LIBRARY ${MESHGEMS_TETRA_HPC_LIBRARY} ${MESHGEMS_LIBRARY_meshgems})
 ENDIF(MESHGEMS_LIBRARY_meshgems)
 
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MESHGEMS REQUIRED_VARS MESHGEMS_INCLUDE_DIRS MESHGEMS_LIBRARIES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MESHGEMS REQUIRED_VARS MESHGEMS_INCLUDE_DIRS MESHGEMS_CADSURF_LIBRARY MESHGEMS_HEXA_LIBRARY MESHGEMS_HYBRID_LIBRARY MESHGEMS_TETRA_LIBRARY MESHGEMS_TETRA_HPC_LIBRARY)

diff --git a/cmake/FindSalomeMESHGEMS.cmake b/cmake/FindSalomeMESHGEMS.cmake
index 1eadf6f7138b6d8b837243e49e8f9fec2572e4b3..8a03c71df7b39c9f808e1c2bc8a6db13b47d2fdc 100644 (file)
--- a/cmake/FindSalomeMESHGEMS.cmake
+++ b/cmake/FindSalomeMESHGEMS.cmake
@@ -18,9 +18,9 @@
 #
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MESHGEMS MESHGEMS_INCLUDE_DIRS 1)
-MARK_AS_ADVANCED(MESHGEMS_INCLUDE_DIRS MESHGEMS_LIBRARIES)
+MARK_AS_ADVANCED(MESHGEMS_INCLUDE_DIRS MESHGEMS_CADSURF_LIBRARY MESHGEMS_HEXA_LIBRARY MESHGEMS_HYBRID_LIBRARY MESHGEMS_TETRA_LIBRARY MESHGEMS_TETRA_HPC_LIBRARY)
 
 IF(MESHGEMS_FOUND)
   SALOME_ACCUMULATE_HEADERS(MESHGEMS_INCLUDE_DIRS)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${MESHGEMS_LIBRARIES})
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${MESHGEMS_CADSURF_LIBRARY} ${MESHGEMS_HEXA_LIBRARY} ${MESHGEMS_HYBRID_LIBRARY} ${MESHGEMS_TETRA_LIBRARY} ${MESHGEMS_TETRA_HPC_LIBRARY})
 ENDIF()