try to use omniORBpy / do not link python

This commit is contained in:
Jules BOURDAIS 2024-10-18 18:26:51 +02:00
parent 608c1be0bf
commit 9e36d21d9d
5 changed files with 10 additions and 10 deletions

View File

@ -96,10 +96,10 @@ 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)
IF (NOT DEFINED EMSCRIPTEN) FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
FIND_PACKAGE(SalomeOmniORBPy REQUIRED) FIND_PACKAGE(SalomeSWIG REQUIRED)
FIND_PACKAGE(SalomeSWIG REQUIRED)
ELSE() 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})

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(SUBDIRS_COMMON APPEND XAO_Swig GEOM_SWIG) list(APPEND SUBDIRS_COMMON XAO_Swig GEOM_SWIG)
endif() # endif()
## ##
# OPENCV # OPENCV

View File

@ -46,7 +46,7 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${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

@ -56,7 +56,7 @@ ADD_DEFINITIONS(
SET(_link_LIBRARIES SET(_link_LIBRARIES
GEOMBase GEOMBase
Material Material
${PYTHON_LIBRARIES} # ${PYTHON_LIBRARIES}
) )
# --- 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 ---