Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ralna/CUTEst
Browse files Browse the repository at this point in the history
  • Loading branch information
dalekopera committed Oct 29, 2024
2 parents 7dda433 + 236db7b commit a9da31c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
matrix:
os: [windows-latest, ubuntu-latest, macos-13]
arch: ['x64']
version: ['11']
version: ['12']
int: ['32', '64']
mode: ['static', 'shared']
include:
Expand Down
12 changes: 11 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ cc = meson.get_compiler('c')
fc = meson.get_compiler('fortran')
fc_compiler = find_program(fc.cmd_array())

# Remove messages about deprecated Intel compilers
if cc.get_id() == 'intel'
add_global_arguments('-diag-disable=10441', language : 'c')
add_global_link_arguments('-diag-disable=10441', language : 'c')
endif
if cc.get_id() == 'intel-cl'
add_global_arguments('/Qdiag-disable=10441', language : 'c')
add_global_link_arguments('/Qdiag-disable=10441', language : 'c')
endif

# Options
install_modules = get_option('modules')
build_quadruple = get_option('quadruple')
Expand Down Expand Up @@ -253,7 +263,7 @@ if build_tests
endif

# C tests
if build_tests
if build_tests and (fc.get_id() == 'gcc')

fortran_tests_folder = 'tests/C'

Expand Down

0 comments on commit a9da31c

Please sign in to comment.