Commit b7c3ad0a authored by Michael Turner's avatar Michael Turner
Browse files

cmake fix

parent 4754463c
......@@ -269,7 +269,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
# Build active components
IF (NEKTAR_BUILD_LIBRARY)
SET(NEKTAR++_LIBRARIES SolverUtils LibUtilities StdRegions SpatialDomains LocalRegions
MultiRegions Collections MeshUtils)
MultiRegions Collections)
IF(NEKTAR_USE_MESH)
SET(NEKTAR++_LIBRARIES ${NEKTAR++_LIBRARIES} MeshUtils)
ENDIF(NEKTAR_USE_MESH)
INCLUDE_DIRECTORIES(library)
ADD_SUBDIRECTORY(library)
INSTALL(EXPORT Nektar++Libraries DESTINATION ${LIB_DIR}/cmake)
......
......@@ -6,6 +6,10 @@
#
########################################################################
OPTION(NEKTAR_USE_MESH "Build meshing utilities." OFF)
IF(NEKTAR_USE_MESH)
# First search for system Triangle installs. Hint /opt/local for MacPorts.
FIND_PATH (TRIANGLE_INCLUDE_DIR triangle.h PATHS /opt/local/include)
FIND_LIBRARY(TRIANGLE_LIBRARY NAMES "triangle" PATHS /opt/local/lib)
......@@ -64,3 +68,5 @@ ENDIF (THIRDPARTY_BUILD_TRIANGLE)
INCLUDE_DIRECTORIES(SYSTEM ${TRIANGLE_INCLUDE_DIR})
ENDIF(NEKTAR_USE_MESH)
SET(LibrarySubDirs LibUtilities LocalRegions Collections MeshUtils
SET(LibrarySubDirs LibUtilities LocalRegions Collections
MultiRegions SpatialDomains StdRegions SolverUtils)
SET(UnitTestSubDirs UnitTests)
SET(DemoSubDirs Demos)
......@@ -18,5 +18,9 @@ ENDIF( NEKTAR_BUILD_DEMOS )
IF( NEKTAR_BUILD_TIMINGS )
SUBDIRS(${TimingsSubDirs})
ENDIF( NEKTAR_BUILD_TIMINGS )
ENDIF( NEKTAR_BUILD_TIMINGS )
IF(NEKTAR_USE_MESH)
SET(LibrarySubDirs ${LibrarySubDirs} MeshUtils)
ENDIF(NEKTAR_USE_MESH)
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