Merge pull request #1509 from su2code/upgrade_meson

Upgrade to meson 0.61.1
su2code · Jan 21, 2022 · 4965cf4 · 4965cf4
2 parents 83d232b + 6d560d2
commit 4965cf4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/externals/cgns/hdf5/meson.build b/externals/cgns/hdf5/meson.build
@@ -6,7 +6,7 @@ else
                            '-Wno-unused-variable',
                            '-Wno-unused-but-set-variable',
                            '-Wno-sign-compare',
-			   '-Wno-stringop-overflow',
+                           '-Wno-stringop-overflow',
                            '-Wno-discarded-qualifiers',
                            '-Wno-error=maybe-uninitialized',
                            '-Wno-error=unused-function',

diff --git a/externals/cgns/meson.build b/externals/cgns/meson.build
@@ -55,7 +55,7 @@ cgns_include = include_directories('adf', 'adfh', './')
 lib_cgns = static_library('cgns',
                           cgns_sources,
                           install : false,
-			  dependencies : hdf5_dep,
+                          dependencies : hdf5_dep,
                           c_args: cgns_default_warnings)
 
 cgns_dep = declare_dependency(link_with: lib_cgns,

diff --git a/externals/meson b/externals/meson
diff --git a/meson_scripts/init.py b/meson_scripts/init.py
@@ -50,7 +50,7 @@ def init_submodules(method = 'auto'):
   github_repo_medi = 'https://github.com/SciCompKL/MeDiPack'
   sha_version_opdi = '6fb2691b8e4a8f00f47d2a27740fa890df0b5405'
   github_repo_opdi = 'https://github.com/SciCompKL/OpDiLib'
-  sha_version_meson = '29ef4478df6d3aaca40c7993f125b29409be1de2'
+  sha_version_meson = '41c650a040d50e0912d268af7a903a9ce1456dfa'
   github_repo_meson = 'https://github.com/mesonbuild/meson'
   sha_version_ninja = '52649de2c56b63f42bc59513d51286531c595b44'
   github_repo_ninja = 'https://github.com/ninja-build/ninja'