Skip to content

Commit

Permalink
science/elmerfem: support opencascade-7.8.0
Browse files Browse the repository at this point in the history
PR:		277307
  • Loading branch information
Henrik Gulbrandsen authored and thierry-FreeBSD committed Mar 21, 2024
1 parent 70f1baf commit d0646a9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
8 changes: 4 additions & 4 deletions science/elmerfem/Makefile
@@ -1,7 +1,7 @@
PORTNAME= elmerfem
DISTVERSIONPREFIX= release-
DISTVERSION= 9.0
PORTREVISION= 14
PORTREVISION= 15
CATEGORIES= science

PATCH_SITES= https://github.com/ElmerCSC/${PORTNAME}/commit/
Expand Down Expand Up @@ -97,10 +97,10 @@ post-patch:
@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
${WRKSRC}/elmergrid/src/egparallel.c

post-patch-OCC-on:
@${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \
pre-configure-OCC-on:
${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \
"${WRKSRC}/cmake/Modules/FindOCE.cmake"
@${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \
${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \
"${WRKSRC}/cmake/Modules/FindOCE.cmake"

post-configure:
Expand Down
15 changes: 15 additions & 0 deletions science/elmerfem/files/patch-ElmerGUI_CMakeLists.txt
@@ -0,0 +1,15 @@
--- ElmerGUI/CMakeLists.txt.orig 2020-11-10 19:52:44 UTC
+++ ElmerGUI/CMakeLists.txt
@@ -83,7 +83,11 @@ IF(WITH_OCC)
MESSAGE(STATUS " [ElmerGUI] OCE_VERSION: " ${OCE_VERSION})
MESSAGE(STATUS " [ElmerGUI] OCE_INCLUDE_DIRS: " ${OCE_INCLUDE_DIRS})
ENDIF()
- SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKSTEP;TKMesh;TKIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKSTEP209;TKSTEPAttr;TKSTEPBase;TKTopAlgo;TKXSBase" CACHE INTERNAL "")
+ IF(OCE_VERSION AND OCE_VERSION VERSION_GREATER_EQUAL "7.8.0")
+ SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKDESTEP;TKMesh;TKDEIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKTopAlgo;TKXSBase" CACHE INTERNAL "")
+ ELSE()
+ SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKSTEP;TKMesh;TKIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKSTEP209;TKSTEPAttr;TKSTEPBase;TKTopAlgo;TKXSBase" CACHE INTERNAL "")
+ ENDIF()
MESSAGE(STATUS " [ElmerGUI] ELMER_OCC_LIBS: " "${ELMER_OCC_LIBS}")
MESSAGE(STATUS "------------------------------------------------")
ENDIF()

0 comments on commit d0646a9

Please sign in to comment.