try to use swig wrapper instread of CORBA

This commit is contained in:
Jules BOURDAIS 2024-11-19 10:14:15 +01:00
parent 9e36d21d9d
commit 9cbf811a77
13 changed files with 28 additions and 16 deletions

View File

@ -28,6 +28,7 @@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
if (DEFINED EMSCRIPTEN) if (DEFINED EMSCRIPTEN)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
list(APPEND CMAKE_FIND_ROOT_PATH "/") list(APPEND CMAKE_FIND_ROOT_PATH "/")
message("Using Emscripten") message("Using Emscripten")
add_compile_options("--use-port=boost_headers" "-pthread") add_compile_options("--use-port=boost_headers" "-pthread")
@ -67,7 +68,7 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
# ============== # ==============
INCLUDE(SalomeSetupPlatform) # From KERNEL INCLUDE(SalomeSetupPlatform) # From KERNEL
# Always build libraries as shared objects: # Always build libraries as shared objects:
SET(BUILD_SHARED_LIBS TRUE) SET(BUILD_SHARED_LIBS FALSE)
# User options # User options
# ============ # ============
@ -96,13 +97,14 @@ MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_GEOM_USE_OPENCV SALOME_GEOM_USE_VTK)
FIND_PACKAGE(SalomePythonInterp REQUIRED) FIND_PACKAGE(SalomePythonInterp REQUIRED)
FIND_PACKAGE(SalomePythonLibs REQUIRED) FIND_PACKAGE(SalomePythonLibs REQUIRED)
FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
FIND_PACKAGE(SalomeSWIG REQUIRED) FIND_PACKAGE(SalomeSWIG REQUIRED)
IF (DEFINED EMSCRIPTEN) IF (DEFINED EMSCRIPTEN)
FIND_PACKAGE(SalomePythonWasm REQUIRED) FIND_PACKAGE(SalomePythonWasm REQUIRED)
SET(PYTHON_INCLUDE_DIRS ${PYTHONWASM_INCLUDE_DIR}) SET(PYTHON_INCLUDE_DIRS ${PYTHONWASM_INCLUDE_DIR})
SET(PYTHON_LIBRARIES ${PYTHONWASM_LIB}) SET(PYTHON_LIBRARIES ${PYTHONWASM_LIB})
ELSE()
FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
ENDIF() ENDIF()
FIND_PACKAGE(SalomePThread REQUIRED) FIND_PACKAGE(SalomePThread REQUIRED)

View File

@ -34,7 +34,8 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} # ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
TKGeomAlgo TKTopAlgo TKPrim TKBO TKShHealing TKBool TKHLR TKFillet TKOffset TKFeat TKMesh
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
) )

View File

@ -35,7 +35,8 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} # ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
TKGeomAlgo TKTopAlgo TKPrim TKBO TKShHealing TKBool TKHLR TKFillet TKOffset TKFeat TKMesh
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
) )

View File

@ -27,9 +27,9 @@ SET(SUBDIRS_COMMON
STLPlugin BREPPlugin STEPPlugin IGESPlugin XAOPlugin Tools STLPlugin BREPPlugin STEPPlugin IGESPlugin XAOPlugin Tools
) )
# if (NOT DEFINED EMSCRIPTEN) if (NOT DEFINED EMSCRIPTEN)
list(APPEND SUBDIRS_COMMON XAO_Swig GEOM_SWIG) list(APPEND SUBDIRS_COMMON XAO_Swig GEOM_SWIG)
# endif() endif()
## ##
# OPENCV # OPENCV

View File

@ -36,7 +36,8 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} # ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
TKGeomAlgo TKTopAlgo TKPrim TKBO TKShHealing TKBool TKHLR TKFillet TKOffset TKFeat TKMesh
GEOMbasic GEOMUtils GEOMbasic GEOMUtils
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
) )

View File

@ -45,7 +45,8 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} # ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
TKGeomAlgo TKTopAlgo TKPrim TKBO TKShHealing TKBool TKHLR TKFillet TKOffset TKFeat TKMesh
# ${PYTHON_LIBRARIES} # ${PYTHON_LIBRARIES}
ShHealOper GEOMbasic BlockFix GEOMAlgo GEOMUtils GEOMSketcher GEOMArchimede XAO ShHealOper GEOMbasic BlockFix GEOMAlgo GEOMUtils GEOMSketcher GEOMArchimede XAO
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}

View File

@ -37,7 +37,8 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${OpenCASCADE_ModelingData_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES}
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} # ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
TKGeomAlgo TKTopAlgo TKPrim TKBO TKShHealing TKBool TKHLR TKFillet TKOffset TKFeat TKMesh
${OpenCASCADE_Visualization_LIBRARIES} ${OpenCASCADE_Visualization_LIBRARIES}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}

View File

@ -56,7 +56,7 @@ ADD_DEFINITIONS(
SET(_link_LIBRARIES SET(_link_LIBRARIES
GEOMBase GEOMBase
Material Material
# ${PYTHON_LIBRARIES} ${PYTHON_LIBRARIES}
) )
# --- headers --- # --- headers ---

View File

@ -36,7 +36,8 @@ ADD_DEFINITIONS(
SET(_link_LIBRARIES SET(_link_LIBRARIES
VTK::FiltersCore VTK::FiltersCore
${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} # ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
TKGeomAlgo TKTopAlgo TKPrim TKBO TKShHealing TKBool TKHLR TKFillet TKOffset TKFeat TKMesh
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
GEOMUtils GEOMUtils
) )

View File

@ -34,7 +34,8 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} # ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
TKGeomAlgo TKTopAlgo TKPrim TKBO TKShHealing TKBool TKHLR TKFillet TKOffset TKFeat TKMesh
${OpenCASCADE_ModelingData_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
) )

View File

@ -33,7 +33,9 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${OpenCASCADE_ApplicationFramework_LIBRARIES} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${OpenCASCADE_ApplicationFramework_LIBRARIES}
# ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
TKGeomAlgo TKTopAlgo TKPrim TKBO TKShHealing TKBool TKHLR TKFillet TKOffset TKFeat TKMesh
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
) )

View File

@ -41,7 +41,8 @@ SET(_link_LIBRARIES
${PTHREAD_LIBRARIES} ${PTHREAD_LIBRARIES}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${OpenCASCADE_ModelingData_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES}
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} # ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
TKGeomAlgo TKTopAlgo TKPrim TKBO TKShHealing TKBool TKHLR TKFillet TKOffset TKFeat TKMesh
) )
# --- headers --- # --- headers ---

View File

@ -38,7 +38,7 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
XAO XAO
# ${PYTHON_LIBRARIES} ${PYTHON_LIBRARIES}
) )
# --- scripts --- # --- scripts ---