From 08b795f305582de19c3c91eed245d5a03dcff775 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Tue, 2 Feb 2021 17:14:13 +0100 Subject: [PATCH] [CMake, ci] CMake preset for PETSc. --- CMakePresets.json | 15 +++++++++++++++ scripts/ci/jobs/build-linux-petsc.yml | 5 +---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index c4185b0da80..1319a413379 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -43,6 +43,21 @@ "OGS_USE_NETCDF": "ON" } }, + { + "name": "release-petsc", + "inherits": "_ninja_release", + "displayName": "PETSc Config (Release)", + "description": "PETSc build using MPI compiler (mpicc, mpic++)", + "cacheVariables": { + "BUILD_SHARED_LIBS": "ON", + "OGS_USE_CONAN": "OFF", + "OGS_USE_PETSC": "ON" + }, + "environment": { + "CC": "mpicc", + "CXX": "mpic++" + } + }, { "name": "ci-simplest", "inherits": "_ninja_release", diff --git a/scripts/ci/jobs/build-linux-petsc.yml b/scripts/ci/jobs/build-linux-petsc.yml index 183edff1f86..122678783cf 100644 --- a/scripts/ci/jobs/build-linux-petsc.yml +++ b/scripts/ci/jobs/build-linux-petsc.yml @@ -4,10 +4,7 @@ build linux petsc: - envinf1-shell timeout: 2h variables: - BUILD_DIR: "build-petsc" BUILD_CTEST_LARGE_ON_MASTER: "true" + CMAKE_PRESET: release-petsc CMAKE_ARGS: >- - -DBUILD_SHARED_LIBS=ON -DOGS_BUILD_UTILS=ON - -DOGS_USE_CONAN=OFF - -DOGS_USE_PETSC=ON -- GitLab