Commit 1c07f9ee authored by Dave Moxey's avatar Dave Moxey

fix for occ linux

parent 0f6d74c6
......@@ -66,7 +66,7 @@ IF(NEKTAR_USE_OCC)
SET(OCC_LIBS PTKernel TKernel TKMath TKBRep TKIGES TKSTEP TKSTEPAttr
TKSTEP209 TKSTEPBase TKShapeSchema TKGeomBase TKGeomAlgo TKG3d TKG2d
TKXSBase TKPShape TKTopAlgo CACHE FILEPATH "OCC library" FORCE)
TKXSBase TKPShape TKTopAlgo)
MESSAGE(STATUS "Link to OCC: ${OCC_LIBS}.so")
ENDIF()
......
......@@ -12,15 +12,15 @@ IF(NEKTAR_USE_MESH)
SET(BUILD_TETGEN ON)
OPTION(THIRDPARTY_BUILD_TETGEN
"Build Triangle library from ThirdParty." ${BUILD_TETGEN})
"Build TetGen library from ThirdParty." ${BUILD_TETGEN})
IF (THIRDPARTY_BUILD_TETGEN)
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
tetgen-1.5
PREFIX ${TPSRC}
URL http://ae-nektar.ae.ic.ac.uk/~mt4313/tetgen.zip
URL_MD5 e79a5845c88acd9c848e74e9bfefb285
URL http://ae-nektar.ae.ic.ac.uk/~dmoxey/tetgen.zip
URL_MD5 6d62e63f9b1e7a8ce53d5bc87e6a0a09
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/tetgen-1.5
......
......@@ -22,8 +22,8 @@ IF (THIRDPARTY_BUILD_TRIANGLE)
EXTERNALPROJECT_ADD(
triangle-1.6
PREFIX ${TPSRC}
URL http://ae-nektar.ae.ic.ac.uk/~mt4313/triangle.zip
URL_MD5 c4a72e5dfd7ae7bedfcf7729ef22747d
URL http://ae-nektar.ae.ic.ac.uk/~dmoxey/triangle.zip
URL_MD5 357cb7107f51f3f89940c47435d4fa49
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/triangle-1.6
......
......@@ -89,7 +89,7 @@ ENDIF()
IF(NEKTAR_USE_OCC)
SET(OCC_DEF LIN LININTEL HAVE_WOK_CONFIG_H HAVE_CONFIG_H CSFDB)
SET_TARGET_PROPERTIES(NekMeshUtils PROPERTIES COMPILE_DEFINITIONS "${OCC_DEF}")
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${OCC_LIBS})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC ${OCC_LIBS})
ADD_DEPENDENCIES(NekMeshUtils opencascade-6.8)
ENDIF(NEKTAR_USE_OCC)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment