Skip to content

Commit

Permalink
Release 4.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
amontoison authored and nimgould committed Dec 8, 2023
1 parent 9deffb3 commit 33214d7
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ task:
echo "OMP_PROC_BIND=TRUE" >> $CIRRUS_ENV
configure_script: |
if [ "$(uname -s)" = "FreeBSD" ]; then
FC=gfortran12 CC=gcc12 CXX=g++12 meson setup builddir -Dpythoniface=true
FC=gfortran12 CC=gcc12 CXX=g++12 meson setup builddir --buildtype=debug -Dexamples=true -Dtests=true -Dpythoniface=true
else
FC=gfortran-12 CC=gcc-12 CXX=g++-12 meson setup builddir -Dpythoniface=true
FC=gfortran-12 CC=gcc-12 CXX=g++-12 meson setup builddir --buildtype=debug -Dexamples=true -Dtests=true -Dpythoniface=true
fi
build_script: |
meson compile -C builddir
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/standalone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,15 @@ jobs:
shell: bash
run: |
if [[ "${{matrix.int64}}" == "true" ]]; then
meson setup builddir --prefix=$GITHUB_WORKSPACE/galahad -Dpythoniface=true -Dgalahad_int64=true \
-Dlibblas_path=$DEPS/lapack -Dliblapack_path=$DEPS/lapack \
-Dlibblas=blas64 -Dliblapack=lapack64
meson setup builddir --buildtype=debug -Dexamples=true -Dtests=true \
--prefix=$GITHUB_WORKSPACE/galahad -Dpythoniface=true \
-Dgalahad_int64=true -Dlibblas_path=$DEPS/lapack \
-Dliblapack_path=$DEPS/lapack -Dlibblas=blas64 \
-Dliblapack=lapack64
else
meson setup builddir --prefix=$GITHUB_WORKSPACE/galahad -Dpythoniface=true -Dgalahad_int64=false
meson setup builddir --buildtype=debug -Dexamples=true -Dtests=true \
--prefix=$GITHUB_WORKSPACE/galahad -Dpythoniface=true \
-Dgalahad_int64=false
fi
env:
CC: ${{ matrix.cc_cmd }}
Expand Down
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
project(
'GALAHAD',
'c', 'cpp', 'fortran',
version: '5.0.0',
version: '4.1.1',
license: 'BSD-3',
meson_version: '>= 0.63.0',
default_options: [
'buildtype=debug',
'buildtype=release',
'libdir=lib',
'default_library=both',
'default_library=shared',
'warning_level=0',
'c_std=c99',
'cpp_std=c++11',
Expand Down
4 changes: 2 additions & 2 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ option('pythoniface',

option('examples',
type : 'boolean',
value : true,
value : false,
description : 'whether to generate the examples')

option('tests',
type : 'boolean',
value : true,
value : false,
description : 'whether to generate the tests')

option('single',
Expand Down

0 comments on commit 33214d7

Please sign in to comment.