Commit f0585325 authored by Dave Moxey's avatar Dave Moxey

Bump PETSc to 3.5.2, add missing dependencies, change to using MAKE_EXECUTABLE...

Bump PETSc to 3.5.2, add missing dependencies, change to using MAKE_EXECUTABLE to avoid parallel build issues
parent 66154758
......@@ -24,16 +24,16 @@ IF (NEKTAR_USE_PETSC)
ENDIF (NEKTAR_USE_MPI)
EXTERNALPROJECT_ADD(
petsc-3.5.1
petsc-3.5.2
PREFIX ${TPSRC}
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPBUILD}/petsc-3.5.1
TMP_DIR ${TPBUILD}/petsc-3.5.1-tmp
SOURCE_DIR ${TPBUILD}/petsc-3.5.2
TMP_DIR ${TPBUILD}/petsc-3.5.2-tmp
INSTALL_DIR ${TPDIST}
BINARY_DIR ${TPBUILD}/petsc-3.5.1
URL http://www.nektar.info/thirdparty/petsc-lite-3.5.1.tar.gz
URL_MD5 "539b3bdb627407b7e4e9e830fd5ccf43"
BINARY_DIR ${TPBUILD}/petsc-3.5.2
URL http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.5.2.tar.gz
URL_MD5 "d707336a98d7cb31d843804d020edc94"
CONFIGURE_COMMAND ./configure
--with-cc=${PETSC_C_COMPILER}
--with-cxx=${PETSC_CXX_COMPILER}
......@@ -44,7 +44,7 @@ IF (NEKTAR_USE_PETSC)
--with-petsc-arch=c-opt
--with-fc=0
${PETSC_NO_MPI}
)
BUILD_COMMAND make)
INCLUDE_DIRECTORIES(${TPDIST}/include)
SET(PETSC_LIBRARIES "${TPDIST}/lib/libpetsc.a")
......@@ -57,6 +57,7 @@ IF (NEKTAR_USE_PETSC)
MESSAGE(STATUS "Found PETSc: ${PETSC_LIBRARIES}")
ENDIF (NOT PETSC_FOUND)
INCLUDE_DIRECTORIES(${PETSC_INCLUDES})
ADD_CUSTOM_TARGET(petsc-3.5.2 ALL)
ENDIF (THIRDPARTY_BUILD_PETSC)
ENDIF( NEKTAR_USE_PETSC )
......
......@@ -142,6 +142,7 @@ ENDIF( NEKTAR_USE_MPI )
IF( NEKTAR_USE_PETSC )
TARGET_LINK_LIBRARIES(MultiRegions LINK_PRIVATE ${PETSC_LIBRARIES})
ADD_DEPENDENCIES(MultiRegions petsc-3.5.2)
ENDIF( NEKTAR_USE_PETSC )
INSTALL(DIRECTORY ./ DESTINATION ${NEKTAR_INCLUDE_DIR}/MultiRegions COMPONENT dev FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
......
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