From 2027c1bc2775daba052696546004876a1a312603 Mon Sep 17 00:00:00 2001 From: webmanue <manuel.weberndorfer@id.ethz.ch> Date: Tue, 8 Feb 2022 13:45:17 +0000 Subject: [PATCH] upgrade petsc/slepc to 3.15 - 3.15 is the version provided by Ubuntu Jammy --- cmake/ae108-config.cmake | 2 +- cmake/modules/FindAE108_GTest.cmake | 2 +- cmake/modules/FindAE108_SLEPc.cmake | 4 ++-- docker/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/ae108-config.cmake b/cmake/ae108-config.cmake index 0bc41120..43157de8 100644 --- a/cmake/ae108-config.cmake +++ b/cmake/ae108-config.cmake @@ -20,7 +20,7 @@ find_dependency(Boost 1.67 COMPONENTS program_options REQUIRED) find_dependency(Eigen3 3.3 CONFIG REQUIRED) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules") -find_dependency(AE108_PETSc MODULE 3.12) +find_dependency(AE108_PETSc MODULE 3.15) find_dependency(range-v3 0.10.0 CONFIG REQUIRED) diff --git a/cmake/modules/FindAE108_GTest.cmake b/cmake/modules/FindAE108_GTest.cmake index 4ced8d16..c1566d58 100644 --- a/cmake/modules/FindAE108_GTest.cmake +++ b/cmake/modules/FindAE108_GTest.cmake @@ -47,4 +47,4 @@ endif() find_package_handle_standard_args(AE108_GTest REQUIRED_VARS GTest_FOUND -) \ No newline at end of file +) diff --git a/cmake/modules/FindAE108_SLEPc.cmake b/cmake/modules/FindAE108_SLEPc.cmake index 23380240..81905541 100644 --- a/cmake/modules/FindAE108_SLEPc.cmake +++ b/cmake/modules/FindAE108_SLEPc.cmake @@ -15,7 +15,7 @@ include(FindPkgConfig) pkg_check_modules(SLEPc SLEPc IMPORTED_TARGET) -find_package(AE108_PETSc 1.12 MODULE) +find_package(AE108_PETSc 3.15 MODULE) find_package_handle_standard_args(AE108_SLEPc REQUIRED_VARS SLEPc_FOUND AE108_PETSc_FOUND @@ -28,4 +28,4 @@ if(AE108_SLEPc_FOUND AND NOT TARGET ae108::external::slepc) INTERFACE PkgConfig::SLEPc INTERFACE ae108::external::petsc ) -endif() \ No newline at end of file +endif() diff --git a/docker/Dockerfile b/docker/Dockerfile index 1532237f..ce80ab90 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -46,4 +46,4 @@ RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" \ apt-get install -y \ libpetsc-${PETSC_SCALAR_TYPE}-dev \ - libslepc-${PETSC_SCALAR_TYPE}3.12-dev + libslepc-${PETSC_SCALAR_TYPE}3.15-dev -- GitLab