From 7ee861ff6308bc38e5de48ced14496d3bcab7ee3 Mon Sep 17 00:00:00 2001 From: Alexis Montoison <35051714+amontoison@users.noreply.github.com> Date: Mon, 28 Oct 2024 13:28:12 -0500 Subject: [PATCH 1/3] Update meson.yml (#75) --- .github/workflows/meson.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml index 948d2a0..72c77a1 100644 --- a/.github/workflows/meson.yml +++ b/.github/workflows/meson.yml @@ -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: From 4c361f2ebd8e7267ea1058696c320aefccac536f Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Mon, 28 Oct 2024 13:48:50 -0500 Subject: [PATCH 2/3] Remove messages about deprecated Intel compilers --- meson.build | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meson.build b/meson.build index 5d95bb6..0810e2f 100644 --- a/meson.build +++ b/meson.build @@ -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') From 236db7bcefd3a0f5a0a8f6b2f8d679d7228f0536 Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Mon, 28 Oct 2024 13:50:32 -0500 Subject: [PATCH 3/3] Don't use Intel compilers for C tests --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 0810e2f..0f94455 100644 --- a/meson.build +++ b/meson.build @@ -263,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'