Commit 4eac8679 authored by Michael Turner's avatar Michael Turner
Browse files

cmake fix and changelog

parent a8663504
......@@ -20,6 +20,8 @@ v4.4.0
**NekMesh:**
- Modify curve module to allow for spline input (!628)
- New module for inserting an alternate high-order surface into the
the working mesh (!669)
**FieldConvert:**
- Move all modules to a new library, FieldUtils, to support post-processing
......
......@@ -7,11 +7,14 @@
########################################################################
IF (NOT WIN32)
CMAKE_DEPENDENT_OPTION(NEKTAR_USE_ANN
"Use ANN routines for performing Approximate Nearest Neighbour searches." ON
"NEKTAR_USE_MESHGEN" OFF)
OPTION(NEKTAR_USE_ANN
"Use ANN routines for performing Approximate Nearest Neighbour searches." OFF)
ENDIF(NOT WIN32)
IF( NEKTAR_USE_MESHGEN )
SET(NEKTAR_USE_ANN ON CACHE BOOL "" FORCE)
ENDIF()
IF (NEKTAR_USE_ANN)
# First search for system ANN installs. Hint /opt/local for MacPorts and
# /usr/local/opt/ann for Homebrew.
......
......@@ -82,9 +82,12 @@ ADD_NEKTAR_LIBRARY(NekMeshUtils lib ${NEKTAR_LIBRARY_TYPE}
${NEKMESHUTILS_SOURCES} ${NEKMESHUTILS_HEADERS})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC LocalRegions)
IF(NEKTAR_USE_ANN)
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${ANN_LIBRARY})
ENDIF()
IF(NEKTAR_USE_MESHGEN)
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${TETGEN_LIBRARY})
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)
......
......@@ -23,7 +23,6 @@ SET(NekMeshHeaders
ProcessModules/ProcessSpherigon.h
ProcessModules/ProcessTetSplit.h
ProcessModules/ProcessOptiExtract.h
ProcessModules/ProcessInsertSurface.h
)
SET(NekMeshSources
......@@ -52,7 +51,6 @@ SET(NekMeshSources
ProcessModules/ProcessSpherigon.cpp
ProcessModules/ProcessTetSplit.cpp
ProcessModules/ProcessOptiExtract.cpp
ProcessModules/ProcessInsertSurface.cpp
)
IF (NEKTAR_USE_CCM)
......@@ -70,6 +68,11 @@ IF (NEKTAR_USE_MESHGEN)
SET(NekMeshSources ${NekMeshSources} InputModules/InputCAD.cpp)
ENDIF (NEKTAR_USE_MESHGEN)
IF (NEKTAR_USE_ANN)
SET(NekMeshHeaders ${NekMeshHeaders} ProcessModules/ProcessInsertSurface.h)
SET(NekMeshSources ${NekMeshSources} ProcessModules/ProcessInsertSurface.cpp)
ENDIF (NEKTAR_USE_ANN)
# Don't use macro -- this way we can just link against NekMeshUtils and
# LocalRegions.
ADD_EXECUTABLE(NekMesh ${NekMeshSources})
......
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