Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nektar
Nektar
Commits
b6ce28d5
Commit
b6ce28d5
authored
Jun 22, 2016
by
Kilian Lackhove
Browse files
updated PETSc to version 3.7.2 to fix configure crash with openmpi 1.10.2 on archlinux
parent
f1a9cfe0
Changes
3
Hide whitespace changes
Inline
Side-by-side
cmake/ThirdPartyPETSc.cmake
View file @
b6ce28d5
...
...
@@ -28,6 +28,8 @@ IF (NEKTAR_USE_PETSC)
FIND_PACKAGE
(
PythonInterp 2 REQUIRED
)
message
(
STATUS
"PYTHON_EXECUTABLE
${
PYTHON_EXECUTABLE
}
"
)
SET
(
PETSC_C_COMPILER
"
${
CMAKE_C_COMPILER
}
"
)
SET
(
PETSC_CXX_COMPILER
"
${
CMAKE_CXX_COMPILER
}
"
)
...
...
@@ -41,16 +43,16 @@ IF (NEKTAR_USE_PETSC)
ENDIF
(
NEKTAR_USE_MPI
)
EXTERNALPROJECT_ADD
(
petsc-3.
5
.2
petsc-3.
7
.2
PREFIX
${
TPSRC
}
STAMP_DIR
${
TPBUILD
}
/stamp
DOWNLOAD_DIR
${
TPSRC
}
SOURCE_DIR
${
TPBUILD
}
/petsc-3.
5
.2
TMP_DIR
${
TPBUILD
}
/petsc-3.
5
.2-tmp
SOURCE_DIR
${
TPBUILD
}
/petsc-3.
7
.2
TMP_DIR
${
TPBUILD
}
/petsc-3.
7
.2-tmp
INSTALL_DIR
${
TPDIST
}
BINARY_DIR
${
TPBUILD
}
/petsc-3.
5
.2
URL http://
www.nektar.info/thirdparty
/petsc-lite-3.
5
.2.tar.gz
URL_MD5
"
d707336a98d7cb31d843804d020edc94
"
BINARY_DIR
${
TPBUILD
}
/petsc-3.
7
.2
URL http://
ftp.mcs.anl.gov/pub/petsc/release-snapshots
/petsc-lite-3.
7
.2.tar.gz
URL_MD5
"
26c2ff8eaaa9e49aea063f839f5daa7e
"
CONFIGURE_COMMAND
OMPI_CC=
${
CMAKE_C_COMPILER
}
OMPI_CXX=
${
CMAKE_CXX_COMPILER
}
...
...
@@ -84,7 +86,7 @@ IF (NEKTAR_USE_PETSC)
ENDIF
(
NOT PETSC_FOUND
)
SET
(
PETSC_CONFIG_INCLUDE_DIR
${
PETSC_INCLUDES
}
)
INCLUDE_DIRECTORIES
(
${
PETSC_INCLUDES
}
)
ADD_CUSTOM_TARGET
(
petsc-3.
5
.2 ALL
)
ADD_CUSTOM_TARGET
(
petsc-3.
7
.2 ALL
)
ENDIF
(
THIRDPARTY_BUILD_PETSC
)
ADD_DEFINITIONS
(
-DNEKTAR_USING_PETSC
)
...
...
library/LibUtilities/CMakeLists.txt
View file @
b6ce28d5
...
...
@@ -460,7 +460,7 @@ ENDIF( NEKTAR_USE_BLAS_LAPACK )
IF
(
NEKTAR_USE_PETSC
)
TARGET_LINK_LIBRARIES
(
LibUtilities LINK_PRIVATE
${
PETSC_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
LibUtilities LINK_PUBLIC
${
CMAKE_DL_LIBS
}
)
ADD_DEPENDENCIES
(
LibUtilities petsc-3.
5
.2
)
ADD_DEPENDENCIES
(
LibUtilities petsc-3.
7
.2
)
ENDIF
(
NEKTAR_USE_PETSC
)
INSTALL
(
FILES
${
ExpressionTemplates
}
DESTINATION
${
NEKTAR_INCLUDE_DIR
}
/ExpressionTemplates COMPONENT dev
)
...
...
library/MultiRegions/CMakeLists.txt
View file @
b6ce28d5
...
...
@@ -144,7 +144,7 @@ ENDIF( NEKTAR_USE_MPI )
IF
(
NEKTAR_USE_PETSC
)
TARGET_LINK_LIBRARIES
(
MultiRegions LINK_PRIVATE
${
PETSC_LIBRARIES
}
)
ADD_DEPENDENCIES
(
MultiRegions petsc-3.
5
.2
)
ADD_DEPENDENCIES
(
MultiRegions petsc-3.
7
.2
)
ENDIF
(
NEKTAR_USE_PETSC
)
INSTALL
(
DIRECTORY ./ DESTINATION
${
NEKTAR_INCLUDE_DIR
}
/MultiRegions COMPONENT dev FILES_MATCHING PATTERN
"*.h"
PATTERN
"*.hpp"
)
...
...
Kilian Lackhove
@lackhove
mentioned in commit
295d2409
·
Jul 13, 2016
mentioned in commit
295d2409
mentioned in commit 295d2409cb4fa47fe35376c1ae6a5f62a2af72e0
Toggle commit list
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