Commit c34564f7 authored by Chris Cantwell's avatar Chris Cantwell

Fixed compile errors after master merge.

Switched scotch from shared library to static library build.
parent 5f0c8e48
......@@ -17,9 +17,9 @@ IF( NEKTAR_USE_SCOTCH )
SET(SCOTCH_SRC ${TPSRC}/src/scotch-6.0.0/src)
IF (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
SET(SCOTCH_MAKE Makefile.inc.x86-64_pc_linux2.shlib)
SET(SCOTCH_MAKE Makefile.inc.x86-64_pc_linux2)
ELSE ()
SET(SCOTCH_MAKE Makefile.inc.i686_pc_linux2.shlib)
SET(SCOTCH_MAKE Makefile.inc.i686_pc_linux2)
ENDIF ()
INCLUDE(ExternalProject)
......@@ -34,7 +34,8 @@ IF( NEKTAR_USE_SCOTCH )
${SCOTCH_SRC}/Make.inc/${SCOTCH_MAKE}
${SCOTCH_SRC}/Makefile.inc
BUILD_COMMAND $(MAKE) -C ${TPSRC}/src/scotch-6.0.0/src
"LDFLAGS=-lz -lm -lrt -lpthread" scotch
"LDFLAGS=-lz -lm -lrt -lpthread"
"CLIBFLAGS=-fPIC" scotch
INSTALL_COMMAND $(MAKE) -C ${TPSRC}/src/scotch-6.0.0/src
prefix=${TPSRC}/dist install
)
......
......@@ -41,7 +41,7 @@ ADD_NEKTAR_EXECUTABLE(Matrix demos VecMatSources)
TARGET_LINK_LIBRARIES(Matrix LibUtilities)
ADD_NEKTAR_EXECUTABLE(PartitionAnalyse demos PartitionAnalyseSources)
SET_LAPACK_LINK_LIBRARIES(PartitionAnalyse)
TARGET_LINK_LIBRARIES(PartitionAnalyse LibUtilities)
ADD_NEKTAR_EXECUTABLE(FoundationDemo demos FoundationSources )
TARGET_LINK_LIBRARIES(FoundationDemo LibUtilities)
......
......@@ -200,7 +200,7 @@ namespace Nektar
// type.
if (m_comm->GetSize() > 1)
{
m_solverInfoDefaults["GLOBALSYSSOLN"] =
GetSolverInfoDefaults()["GLOBALSYSSOLN"] =
"IterativeStaticCond";
}
}
......@@ -241,7 +241,7 @@ namespace Nektar
if (m_comm->GetSize() > 1)
{
m_solverInfoDefaults["GLOBALSYSSOLN"] =
GetSolverInfoDefaults()["GLOBALSYSSOLN"] =
"IterativeStaticCond";
}
}
......@@ -250,7 +250,7 @@ namespace Nektar
// type.
if (m_comm->GetSize() > 1)
{
m_solverInfoDefaults["GLOBALSYSSOLN"] =
GetSolverInfoDefaults()["GLOBALSYSSOLN"] =
"IterativeStaticCond";
}
}
......
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