ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-25 23:57:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

cleanup emscripten fixes

Browse Source
This commit is contained in:
Louis Gombert 2024-08-28 10:06:04 +00:00
parent 6fc3b8cf95
commit 608c1be0bf
7 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -53,7 +53,6 @@ MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \
# Find KERNEL # Find KERNEL
# =========== # ===========
SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
IF(EXISTS ${KERNEL_ROOT_DIR}) IF(EXISTS ${KERNEL_ROOT_DIR})
FIND_PACKAGE(SalomeKERNEL REQUIRED) FIND_PACKAGE(SalomeKERNEL REQUIRED)
@ -101,7 +100,6 @@ IF (NOT DEFINED EMSCRIPTEN)
FIND_PACKAGE(SalomeOmniORBPy REQUIRED) FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
FIND_PACKAGE(SalomeSWIG REQUIRED) FIND_PACKAGE(SalomeSWIG REQUIRED)
ELSE() ELSE()
LIST(TRANSFORM OMNIORB_LIBRARIES REPLACE "\.so$" "\.a")
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})

6
src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx
View File

@ -1059,7 +1059,7 @@ Standard_Integer GEOMAlgo_AlgoTools::PointCloudInFace(const TopoDS_Face& theFace
const int theNbPnts, const int theNbPnts,
TopoDS_Compound& theCompound) TopoDS_Compound& theCompound)
{ {
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
return -1; return -1;
#else #else
ShapeUpgrade_ShapeDivideArea tool (theFace); ShapeUpgrade_ShapeDivideArea tool (theFace);
@ -1568,7 +1568,7 @@ void ModifyFacesForGlobalResult(const TopoDS_Face& theInputFace,
Standard_Integer aNbFacesInLocalResult; Standard_Integer aNbFacesInLocalResult;
if (aNumberToSplit > 1) if (aNumberToSplit > 1)
{ {
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
aNbFacesInLocalResult = 0; aNbFacesInLocalResult = 0;
#else #else
ShapeUpgrade_ShapeDivideArea aLocalTool (aUnifiedShape); ShapeUpgrade_ShapeDivideArea aLocalTool (aUnifiedShape);
@ -1648,7 +1648,7 @@ void ModifyFacesForGlobalResult(const TopoDS_Face& theInputFace,
Standard_Integer aNumberToSplit = (theIsToAddFaces)? aMaxNbFaces + (aDiff-aSum) : aMaxNbFaces - (aDiff-aSum); Standard_Integer aNumberToSplit = (theIsToAddFaces)? aMaxNbFaces + (aDiff-aSum) : aMaxNbFaces - (aDiff-aSum);
if (aNumberToSplit > 1) if (aNumberToSplit > 1)
{ {
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
aNumberToSplit = 1; aNumberToSplit = 1;
#else #else
ShapeUpgrade_ShapeDivideArea aLocalTool (aUnifiedShape); ShapeUpgrade_ShapeDivideArea aLocalTool (aUnifiedShape);

1
src/GEOMImpl/CMakeLists.txt
View File

@ -20,7 +20,6 @@
# --- options --- # --- options ---
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}

16
src/GEOMImpl/GEOMImpl_ICanonicalRecognition.cxx
View File

@ -28,7 +28,7 @@
#include "GEOM_Object.hxx" #include "GEOM_Object.hxx"
#include "GEOM_PythonDump.hxx" #include "GEOM_PythonDump.hxx"
#if 0 #if OCC_VERSION_LARGE > 0x07050303 && !defined(__EMSCRIPTEN__)
#include <ShapeAnalysis_CanonicalRecognition.hxx> #include <ShapeAnalysis_CanonicalRecognition.hxx>
#endif #endif
@ -77,7 +77,7 @@ bool GEOMImpl_ICanonicalRecognition::isPlane(const Handle(GEOM_Object)& theShape
return false; return false;
} }
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer."); SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false; return false;
#else #else
@ -106,7 +106,7 @@ bool GEOMImpl_ICanonicalRecognition::isSphere(const Handle(GEOM_Object)& theShap
return false; return false;
} }
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer."); SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false; return false;
#else #else
@ -135,7 +135,7 @@ bool GEOMImpl_ICanonicalRecognition::isCone(const Handle(GEOM_Object)& theShape,
return false; return false;
} }
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer."); SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false; return false;
#else #else
@ -164,7 +164,7 @@ bool GEOMImpl_ICanonicalRecognition::isCylinder(const Handle(GEOM_Object)& theSh
return false; return false;
} }
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer."); SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false; return false;
#else #else
@ -193,7 +193,7 @@ bool GEOMImpl_ICanonicalRecognition::isLine(const Handle(GEOM_Object)& theEdge,
return false; return false;
} }
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer."); SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false; return false;
#else #else
@ -222,7 +222,7 @@ bool GEOMImpl_ICanonicalRecognition::isCircle(const Handle(GEOM_Object)& theEdge
return false; return false;
} }
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer."); SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false; return false;
#else #else
@ -251,7 +251,7 @@ bool GEOMImpl_ICanonicalRecognition::isEllipse(const Handle(GEOM_Object)& theEdg
return false; return false;
} }
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer."); SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false; return false;
#else #else

2
src/GEOMImpl/GEOMImpl_PointDriver.cxx
View File

@ -319,7 +319,7 @@ Standard_Integer GEOMImpl_PointDriver::Execute(Handle(TFunction_Logbook)& log) c
} }
else else
{ {
#if 1 #if OCC_VERSION_LARGE < 0x07050304 || defined(__EMSCRIPTEN__)
Standard_NotImplemented::Raise("Point cloud creation aborted. Improper OCCT version: please, use OCCT 7.5.3p4 or newer."); Standard_NotImplemented::Raise("Point cloud creation aborted. Improper OCCT version: please, use OCCT 7.5.3p4 or newer.");
#else #else
if (GEOMAlgo_AlgoTools::PointCloudInFace(F, aNbPnts, aCompound) < 0) if (GEOMAlgo_AlgoTools::PointCloudInFace(F, aNbPnts, aCompound) < 0)

2
src/GEOM_I_Superv/CMakeLists.txt
View File

@ -73,5 +73,3 @@ SET(GEOM_SupervEngine_SOURCES
ADD_LIBRARY(GEOM_SupervEngine ${GEOM_SupervEngine_SOURCES}) ADD_LIBRARY(GEOM_SupervEngine ${GEOM_SupervEngine_SOURCES})
TARGET_LINK_LIBRARIES(GEOM_SupervEngine ${_link_LIBRARIES}) TARGET_LINK_LIBRARIES(GEOM_SupervEngine ${_link_LIBRARIES})
INSTALL(TARGETS GEOM_SupervEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) INSTALL(TARGETS GEOM_SupervEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${GEOM_SupervEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})

2
src/GEOM_SWIG/CMakeLists.txt
View File

@ -139,7 +139,7 @@ SALOME_INSTALL_SCRIPTS("${_other_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_DATA} DEF_PER
SALOME_INSTALL_SCRIPTS("${_shared_SCRIPTS}" ${SALOME_INSTALL_PYTHON_SHARED} DEF_PERMS) SALOME_INSTALL_SCRIPTS("${_shared_SCRIPTS}" ${SALOME_INSTALL_PYTHON_SHARED} DEF_PERMS)
SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom DEF_PERMS) SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom DEF_PERMS)
# # Install plugin scripts # Install plugin scripts
SALOME_INSTALL_SCRIPTS("${_python_advanced_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/AdvancedGEOM DEF_PERMS) SALOME_INSTALL_SCRIPTS("${_python_advanced_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/AdvancedGEOM DEF_PERMS)
SALOME_INSTALL_SCRIPTS("${_python_STL_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/STLPlugin DEF_PERMS) SALOME_INSTALL_SCRIPTS("${_python_STL_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/STLPlugin DEF_PERMS)
SALOME_INSTALL_SCRIPTS("${_python_BREP_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/BREPPlugin DEF_PERMS) SALOME_INSTALL_SCRIPTS("${_python_BREP_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/BREPPlugin DEF_PERMS)