Commit c83eabd8 authored by Dave Moxey's avatar Dave Moxey

Fix bug with NEKTAR++_LIBRARIES not being set correctly for external libraries

parent c80edd03
...@@ -302,8 +302,9 @@ INCLUDE_DIRECTORIES(solvers) ...@@ -302,8 +302,9 @@ INCLUDE_DIRECTORIES(solvers)
ADD_SUBDIRECTORY(solvers) ADD_SUBDIRECTORY(solvers)
IF (NEKTAR_BUILD_LIBRARY) IF (NEKTAR_BUILD_LIBRARY)
SET(NEKTAR++_LIBRARIES SolverUtils LibUtilities StdRegions SpatialDomains LocalRegions # List of Nektar++ libraries will be rebuilt every configuration.
MultiRegions Collections GlobalMapping FieldUtils NekMeshUtils) SET(NEKTAR++_LIBRARIES "" CACHE INTERNAL "")
INCLUDE_DIRECTORIES(library) INCLUDE_DIRECTORIES(library)
ADD_SUBDIRECTORY(library) ADD_SUBDIRECTORY(library)
INSTALL(EXPORT Nektar++Libraries DESTINATION ${LIB_DIR}/cmake COMPONENT dev) INSTALL(EXPORT Nektar++Libraries DESTINATION ${LIB_DIR}/cmake COMPONENT dev)
......
...@@ -199,7 +199,7 @@ MACRO(ADD_NEKTAR_LIBRARY name) ...@@ -199,7 +199,7 @@ MACRO(ADD_NEKTAR_LIBRARY name)
STRING(TOUPPER ${name} NEKLIB_COMPVAR) STRING(TOUPPER ${name} NEKLIB_COMPVAR)
# Add name to a list so that we know for constructing dependencies. # Add name to a list so that we know for constructing dependencies.
SET(NEKTAR_LIBS ${NEKTAR_LIBS} ${NEKLIB_COMPONENT} CACHE INTERNAL "") SET(NEKTAR++_LIBRARIES ${NEKTAR++_LIBRARIES} ${name} CACHE INTERNAL "")
SET_PROPERTY(TARGET ${name} PROPERTY FOLDER ${NEKLIB_COMPONENT}) SET_PROPERTY(TARGET ${name} PROPERTY FOLDER ${NEKLIB_COMPONENT})
SET_PROPERTY(TARGET ${name} PROPERTY VERSION ${NEKTAR_VERSION}) SET_PROPERTY(TARGET ${name} PROPERTY VERSION ${NEKTAR_VERSION})
......
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