Commit 8889ff6a authored by Dave Moxey's avatar Dave Moxey
Browse files

Fix for Windows buildbot issue, include GlobalMapping in list of packages

parent 1f98ed4f
......@@ -271,7 +271,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
# Build active components
IF (NEKTAR_BUILD_LIBRARY)
SET(NEKTAR++_LIBRARIES SolverUtils LibUtilities StdRegions SpatialDomains LocalRegions
MultiRegions Collections)
MultiRegions Collections GlobalMapping)
INCLUDE_DIRECTORIES(library)
ADD_SUBDIRECTORY(library)
INSTALL(EXPORT Nektar++Libraries DESTINATION ${LIB_DIR}/cmake)
......
......@@ -40,7 +40,7 @@ namespace Nektar
namespace GlobalMapping
{
MappingSharedPtr Mapping::m_mappingPtr;
MappingSharedPtr Mapping::m_mappingPtr = MappingSharedPtr();
bool Mapping::m_init = false;
bool Mapping::m_isDefined = false;
......@@ -237,7 +237,7 @@ MappingSharedPtr Mapping::Load(
{
if (!m_init)
{
TiXmlElement* vMapping;
TiXmlElement* vMapping = NULL;
string vType;
if (pSession->DefinesElement("Nektar/Mapping"))
{
......
......@@ -7,6 +7,7 @@ list(APPEND libnektar++-spatialdomains_LIBS SpatialDomains)
list(APPEND libnektar++-localregions_LIBS LocalRegions)
list(APPEND libnektar++-collections_LIBS Collections)
list(APPEND libnektar++-multiregions_LIBS MultiRegions)
list(APPEND libnektar++-globalmapping_LIBS GlobalMapping)
list(APPEND libnektar++-solverutils_LIBS SolverUtils)
list(APPEND nektar++-incnavierstokes-solver_BINS IncNavierStokesSolver)
list(APPEND nektar++-cardiacep-solver_BINS CardiacEPSolver)
......@@ -29,7 +30,7 @@ list(APPEND nektar++-demos_BINS Helmholtz1D Helmholtz2D Helmholtz3D
# Nektar++ binary archive
list(APPEND nektar++_LIBS LibUtilities StdRegions SpatialDomains LocalRegions
Collections MultiRegions SolverUtils)
Collections MultiRegions GlobalMapping SolverUtils)
list(APPEND nektar++_BINS ADRSolver IncNavierStokesSolver CardiacEPSolver
CompressibleFlowSolver DiffusionSolver
DiffusionSolverTimeInt ShallowWaterSolver
......@@ -101,6 +102,15 @@ if (NEKTAR_BUILD_LIBRARY)
INSTALL_LIBS "${libnektar++-multiregions_LIBS}")
set(NEK_DEP "${NEK_DEP}, libnektar++-multiregions (= ${NEKTAR_VERSION})")
add_deb_package(
NAME libnektar++-globalmapping
SUMMARY "Nektar++ GlobalMapping library"
DESCRIPTION "
This library provides deformation routines for Nektar++ simulations."
DEPENDS "${NEK_DEP}"
INSTALL_LIBS "${libnektar++-globalmapping_LIBS}")
set(NEK_DEP "${NEK_DEP}, libnektar++-globalmapping (= ${NEKTAR_VERSION})")
if (NEKTAR_BUILD_DEMOS)
add_deb_package(
NAME nektar++-demos
......@@ -244,6 +254,12 @@ if (NEKTAR_BUILD_LIBRARY)
DESCRIPTION
"This library provides global expansions on multi-element domains."
INSTALL_LIBS "${libnektar++-multiregions_LIBS}")
add_rpm_package(
NAME libnektar++-globalmapping
SUMMARY "Nektar++ GlobalMapping library"
DESCRIPTION
"This library provides deformation routines for Nektar++ simulations."
INSTALL_LIBS "${libnektar++-globalmapping_LIBS}")
add_rpm_package(
NAME libnektar++-solverutils
SUMMARY "Nektar++ SolverUtils library"
......
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