diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ca75954b52a33cbda06c5b5d30f01961be70beb..9067a76c88e942f3a2edf0b125d23797d975e627 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -315,6 +315,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) # Build active components. Add utilities and solvers directories first, because # that allows us to detect library dependencies automatically. +IF (NEKTAR_BUILD_LIBRARY) + INCLUDE_DIRECTORIES(library) +ENDIF() + INCLUDE_DIRECTORIES(utilities) ADD_SUBDIRECTORY(utilities) @@ -325,7 +329,6 @@ IF (NEKTAR_BUILD_LIBRARY) # List of Nektar++ libraries will be rebuilt every configuration. SET(NEKTAR++_LIBRARIES "" CACHE INTERNAL "") - INCLUDE_DIRECTORIES(library) ADD_SUBDIRECTORY(library) INSTALL(EXPORT Nektar++Libraries DESTINATION ${LIB_DIR}/cmake COMPONENT dev) ENDIF (NEKTAR_BUILD_LIBRARY) diff --git a/cmake/ThirdPartyMPI.cmake b/cmake/ThirdPartyMPI.cmake index 7170371a2d6c2b38f82ef25d28710648a281ed66..00bd394defa1ef6ea8060d87fac5e5a8710cfad3 100644 --- a/cmake/ThirdPartyMPI.cmake +++ b/cmake/ThirdPartyMPI.cmake @@ -32,7 +32,7 @@ IF( NEKTAR_USE_MPI ) SET(BUILD_MPI ON) ELSE() 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}") ENDIF() ENDIF()