Commit 176b9e12 authored by Dave Moxey's avatar Dave Moxey
Browse files

Merge branch 'fix/cmake-dependancies' into 'master'

fix/cmake-dependencies

With the creation of FieldUtils the dependencies of the libraries and utilities on each other and a little off. This fixes that.

The only major change is, because none of the utilities depend on solverutils anymore it has been made a function of NEKTAR_USE_SOLVERS. This is so that, for people like me, who don't compile the solvers, time isn't wasted compiling unnecessary libraries.

See merge request !671
parents b5474726 b7bac709
......@@ -14,6 +14,7 @@ v4.4.0
- Increased required boost version to 1.56.0 (!584)
- New FieldUtils library allows support for most `FieldConvert` post-processing
operations during simulation using a new filter (!589)
- Adjust CMake dependencies to reduce compile time (!671)
**IncNavierStokesSolver:**
- Add ability to simulate additional scalar fields (!624)
......
SET(LibrarySubDirs FieldUtils GlobalMapping LibUtilities LocalRegions
Collections MultiRegions SpatialDomains StdRegions SolverUtils NekMeshUtils)
SET(LibrarySubDirs FieldUtils GlobalMapping LibUtilities LocalRegions
Collections MultiRegions SpatialDomains StdRegions)
SET(UnitTestSubDirs UnitTests)
SET(DemoSubDirs Demos)
SET(TimingsSubDirs Timings)
SET(SolverUtilsSubDirs SolverUtils)
SET(NekMeshUtilsSubDirs NekMeshUtils)
SUBDIRS(${LibrarySubDirs} )
SUBDIRS(${LibrarySubDirs})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/library)
......@@ -19,3 +21,11 @@ ENDIF( NEKTAR_BUILD_DEMOS )
IF( NEKTAR_BUILD_TIMINGS )
SUBDIRS(${TimingsSubDirs})
ENDIF( NEKTAR_BUILD_TIMINGS )
IF( NEKTAR_BUILD_SOLVERS )
SUBDIRS(${SolverUtilsSubDirs})
ENDIF( NEKTAR_BUILD_SOLVERS )
IF( NEKTAR_BUILD_UTILITIES )
SUBDIRS(${NekMeshUtilsSubDirs})
ENDIF( NEKTAR_BUILD_UTILITIES )
......@@ -72,7 +72,7 @@ ENDIF (NEKTAR_USE_MESHGEN)
# LocalRegions.
ADD_EXECUTABLE(NekMesh ${NekMeshSources})
SET_COMMON_PROPERTIES(NekMesh)
TARGET_LINK_LIBRARIES(NekMesh NekMeshUtils LocalRegions SolverUtils)
TARGET_LINK_LIBRARIES(NekMesh NekMeshUtils FieldUtils)
SET_PROPERTY(TARGET NekMesh PROPERTY FOLDER util)
INSTALL(TARGETS NekMesh
RUNTIME DESTINATION ${NEKTAR_BIN_DIR} COMPONENT util)
......
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