Commit b8637fa2 authored by David Moxey's avatar David Moxey

Fix missing INCLUDE_DIRECTORIES, missing SYSTEM from merge

parent fe9933e7
...@@ -315,6 +315,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) ...@@ -315,6 +315,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
# Build active components. Add utilities and solvers directories first, because # Build active components. Add utilities and solvers directories first, because
# that allows us to detect library dependencies automatically. # that allows us to detect library dependencies automatically.
IF (NEKTAR_BUILD_LIBRARY)
INCLUDE_DIRECTORIES(library)
ENDIF()
INCLUDE_DIRECTORIES(utilities) INCLUDE_DIRECTORIES(utilities)
ADD_SUBDIRECTORY(utilities) ADD_SUBDIRECTORY(utilities)
...@@ -325,7 +329,6 @@ IF (NEKTAR_BUILD_LIBRARY) ...@@ -325,7 +329,6 @@ IF (NEKTAR_BUILD_LIBRARY)
# List of Nektar++ libraries will be rebuilt every configuration. # List of Nektar++ libraries will be rebuilt every configuration.
SET(NEKTAR++_LIBRARIES "" CACHE INTERNAL "") SET(NEKTAR++_LIBRARIES "" CACHE INTERNAL "")
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)
ENDIF (NEKTAR_BUILD_LIBRARY) ENDIF (NEKTAR_BUILD_LIBRARY)
......
...@@ -32,7 +32,7 @@ IF( NEKTAR_USE_MPI ) ...@@ -32,7 +32,7 @@ IF( NEKTAR_USE_MPI )
SET(BUILD_MPI ON) SET(BUILD_MPI ON)
ELSE() ELSE()
MARK_AS_ADVANCED(file_cmd) MARK_AS_ADVANCED(file_cmd)
INCLUDE_DIRECTORIES(${MPI_CXX_INCLUDE_PATH}) INCLUDE_DIRECTORIES(SYSTEM ${MPI_CXX_INCLUDE_PATH})
MESSAGE(STATUS "Found MPI: ${MPI_CXX_LIBRARIES}") MESSAGE(STATUS "Found MPI: ${MPI_CXX_LIBRARIES}")
ENDIF() ENDIF()
ENDIF() 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