Merge branch 'master' of https://github.com/ralna/CUTEst

ralna · Aug 26, 2024 · 7ae913b · 7ae913b
2 parents b964eb9 + 074fb7b
commit 7ae913b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml
@@ -138,11 +138,15 @@ jobs:
           else
             MODE="shared"
           fi
+          QUADRUPLE="true"
+          if [[ "${{ matrix.compiler }}" == "intel-classic" || "${{ matrix.compiler }}" == "intel" ]]; then
+            QUADRUPLE="false"
+          fi
           meson setup builddir --buildtype=debug \
                                --prefix=$GITHUB_WORKSPACE/cutest \
                                -Ddefault_library=${MODE} \
-                               -Dquadruple=true \
-                               -Dint64=$INT64
+                               -Dquadruple=${QUADRUPLE} \
+                               -Dint64=${INT64}
 
       - name: Build CUTEST
         shell: bash

diff --git a/include/cutest.h b/include/cutest.h
@@ -29,7 +29,7 @@
  * give a version number
  */
 
-#define CUTEST_VERSION 2.2.2
+#define CUTEST_VERSION 2.2.3
 
 /*
  * Define name of main() function on a

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
   'CUTEst',
   'fortran', 'c',
-  version: '2.2.2',
+  version: '2.2.3',
   meson_version: '>= 0.62.0',
   default_options: [
     'buildtype=release',
@@ -176,7 +176,7 @@ if build_quadruple
 
   gen_quadruple = generator(fc_compiler,
                             output : 'quadruple_@[email protected]',
-                            arguments : pp_options + '-DREAL_128' +
+                            arguments : pp_options + '-DREAL_128' + '-DCUTEST_16btye_reals_exist' +
                                         ['-I', '@CURRENT_SOURCE_DIR@/include', '@INPUT@'] +
                                         output_generator)