Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Nektar
Nektar
Commits
b8637fa2
Commit
b8637fa2
authored
Jun 26, 2017
by
David Moxey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix missing INCLUDE_DIRECTORIES, missing SYSTEM from merge
parent
fe9933e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
CMakeLists.txt
CMakeLists.txt
+4
-1
cmake/ThirdPartyMPI.cmake
cmake/ThirdPartyMPI.cmake
+1
-1
No files found.
CMakeLists.txt
View file @
b8637fa2
...
...
@@ -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
)
...
...
cmake/ThirdPartyMPI.cmake
View file @
b8637fa2
...
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment