ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-12 22:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'occ_78_compatibility' into 'master'

Browse Source 
Opencascade 7.8.0 compatibility

See merge request ngsolve/netgen!643
This commit is contained in:
Hochsteger, Matthias 2024-03-25 13:06:26 +01:00
commit dfba4edd26
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -375,28 +375,34 @@ if (USE_OCC)
TKGeomAlgo TKGeomAlgo
TKGeomBase TKGeomBase
TKHLR TKHLR
TKIGES
TKLCAF TKLCAF
TKMath TKMath
TKMesh TKMesh
TKOffset TKOffset
TKPrim TKPrim
TKSTEP
TKSTEP209
TKSTEPAttr
TKSTEPBase
TKSTL
TKService TKService
TKShHealing TKShHealing
TKTopAlgo TKTopAlgo
TKV3d TKV3d
TKVCAF TKVCAF
TKXCAF TKXCAF
TKXDEIGES
TKXDESTEP
TKXSBase TKXSBase
TKernel TKernel
) )
if(${OpenCASCADE_MAJOR_VERSION}.${OpenCASCADE_MINOR_VERSION} VERSION_GREATER_EQUAL 7.8)
list(APPEND OCC_LIBRARIES TKDEIGES TKDESTEP TKDESTL)
else()
list(APPEND OCC_LIBRARIES
TKIGES
TKSTEP
TKSTL
TKXDEIGES
TKXDESTEP
TKSTEP209
TKSTEPAttr
TKSTEPBase
)
endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
list(PREPEND OCC_LIBRARIES -Wl,--start-group) list(PREPEND OCC_LIBRARIES -Wl,--start-group)
list(APPEND OCC_LIBRARIES -Wl,--end-group) list(APPEND OCC_LIBRARIES -Wl,--end-group)

6
cmake/SuperBuild.cmake
View File

@ -89,8 +89,10 @@ if(BUILD_OCC)
set(OCC_DIR ${CMAKE_CURRENT_BINARY_DIR}/dependencies/occ) set(OCC_DIR ${CMAKE_CURRENT_BINARY_DIR}/dependencies/occ)
ExternalProject_Add(project_occ ExternalProject_Add(project_occ
URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_3.zip # URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_3.zip
URL_MD5 2426e373903faabbd4f96a01a934b66d # URL_MD5 2426e373903faabbd4f96a01a934b66d
URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_8_0.zip
URL_MD5 19d025bf6b4f6ba1b334d189529573cb
DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies
${SUBPROJECT_ARGS} ${SUBPROJECT_ARGS}
CMAKE_ARGS CMAKE_ARGS

1
libsrc/occ/Partition_Loop3d.hxx
View File

@ -29,7 +29,6 @@
#if OCC_VERSION_HEX < 0x070000 #if OCC_VERSION_HEX < 0x070000
#else #else
#include <TopTools_ShapeMapHasher.hxx> #include <TopTools_ShapeMapHasher.hxx>
#include <TopTools_OrientedShapeMapHasher.hxx>
#include <TopTools_MapOfOrientedShape.hxx> #include <TopTools_MapOfOrientedShape.hxx>
#endif #endif