Commit a889a1de authored by Michael Turner's avatar Michael Turner

more tweaks

parent dba2d970
......@@ -23,7 +23,7 @@ if(NOT DEFINED OCE_DIR)
endif()
endif()
find_package(OCE QUIET)
find_package(OCE QUIET HINTS)
if(OCE_FOUND)
message(STATUS "-- OpenCASCADE Community Edition has been found.")
# Disable this define. For more details see bug #0001872
......@@ -61,12 +61,14 @@ else(OCE_FOUND) #look for OpenCASCADE
/usr/local/opt/opencascade/include
/opt/opencascade/include
/opt/opencascade/inc
# /opt/local/include/oce
)
FIND_LIBRARY(OCC_LIBRARY TKernel
/usr/lib
/usr/local/lib
/usr/local/opt/opencascade/lib
/opt/opencascade/lib
# /opt/local/lib
)
endif(WIN32)
if(OCC_LIBRARY)
......
......@@ -72,6 +72,8 @@ IF(NEKTAR_USE_MESHGEN)
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DINSTALL_DIR:PATH=${TPBUILD}/opencascade-6.9
-DCMAKE_CXX_FLAGS:STRING=-DTIXML_USE_STL
-DBUILD_Draw=OFF
-DBUILD_Visualization=OFF
${TPSRC}/opencascade-6.9
)
......@@ -103,5 +105,6 @@ IF(NEKTAR_USE_MESHGEN)
ADD_CUSTOM_TARGET(opencascade-6.9 ALL)
MESSAGE(STATUS "Found OpenCASCADE: ${OCC_LIBRARY_DIR}")
SET(OPENCASCADE_CONFIG_INCLUDE_DIR ${OCC_INCLUDE_DIR})
INCLUDE_DIRECTORIES(SYSTEM ${OCC_INCLUDE_DIR})
ENDIF()
ENDIF()
......@@ -87,8 +87,8 @@ IF(NEKTAR_USE_MESHGEN)
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${ANN_LIBRARY})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC ${OCC_LIBRARIES})
SET(OCC_DEF LIN LININTEL HAVE_WOK_CONFIG_H HAVE_CONFIG_H CSFDB)
SET_PROPERTY(TARGET NekMeshUtils APPEND PROPERTY COMPILE_DEFINITIONS ${OCC_DEF})
#SET(OCC_DEF LIN LININTEL HAVE_WOK_CONFIG_H HAVE_CONFIG_H CSFDB)
#SET_PROPERTY(TARGET NekMeshUtils APPEND PROPERTY COMPILE_DEFINITIONS ${OCC_DEF})
ADD_DEPENDENCIES(NekMeshUtils opencascade-6.9 tetgen-1.5)
ENDIF()
......
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