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
c83eabd8
Commit
c83eabd8
authored
Jun 26, 2017
by
Dave Moxey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug with NEKTAR++_LIBRARIES not being set correctly for external libraries
parent
c80edd03
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
CMakeLists.txt
CMakeLists.txt
+3
-2
cmake/NektarCommon.cmake
cmake/NektarCommon.cmake
+1
-1
No files found.
CMakeLists.txt
View file @
c83eabd8
...
...
@@ -302,8 +302,9 @@ INCLUDE_DIRECTORIES(solvers)
ADD_SUBDIRECTORY
(
solvers
)
IF
(
NEKTAR_BUILD_LIBRARY
)
SET
(
NEKTAR++_LIBRARIES SolverUtils LibUtilities StdRegions SpatialDomains LocalRegions
MultiRegions Collections GlobalMapping FieldUtils NekMeshUtils
)
# 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
)
...
...
cmake/NektarCommon.cmake
View file @
c83eabd8
...
...
@@ -199,7 +199,7 @@ MACRO(ADD_NEKTAR_LIBRARY name)
STRING
(
TOUPPER
${
name
}
NEKLIB_COMPVAR
)
# Add name to a list so that we know for constructing dependencies.
SET
(
NEKTAR_LIBS
${
NEKTAR_LIB
S
}
${
NEKLIB_COMPONENT
}
CACHE INTERNAL
""
)
SET
(
NEKTAR
++
_LIB
RARIE
S
${
NEKTAR
++
_LIB
RARIES
}
${
name
}
CACHE INTERNAL
""
)
SET_PROPERTY
(
TARGET
${
name
}
PROPERTY FOLDER
${
NEKLIB_COMPONENT
}
)
SET_PROPERTY
(
TARGET
${
name
}
PROPERTY VERSION
${
NEKTAR_VERSION
}
)
...
...
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