Skip to content

Commit

Permalink
updated subprojects
Browse files Browse the repository at this point in the history
- catch2
- fmt
- nlohmann_json
- pybind11
  • Loading branch information
peter-urban committed Sep 17, 2024
1 parent 57f3f86 commit c8836cf
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 25 deletions.
3 changes: 0 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ xtensor_dep = dependency('xtensor', static: true, default_options: ['xsimd=enabl
#fast_float (for fast locale independent float parsing)
fast_float_dep = dependency('fast_float')

#fast_float (for fast locale independent float parsing)
flat_map_dep = dependency('flat_map')

#xxhash_cpp (for fast hashing of classes/buffers)
xxhash_cpp_dep = dependency('xxhash_cpp')

Expand Down
3 changes: 0 additions & 3 deletions src/themachinethatgoesping/tools/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ if build_machine.system() != 'linux'
magic_enum_dep,
xtensor_dep,
fast_float_dep,
flat_map_dep,
frozen_dep,
xxhash_cpp_dep],
override_options: [
Expand All @@ -113,7 +112,6 @@ else
magic_enum_dep,
xtensor_dep,
fast_float_dep,
flat_map_dep,
frozen_dep,
xxhash_cpp_dep],
override_options: [
Expand All @@ -137,7 +135,6 @@ tools_dep = declare_dependency(
magic_enum_dep,
xtensor_dep,
fast_float_dep,
flat_map_dep,
frozen_dep,
xxhash_cpp_dep
],
Expand Down
8 changes: 4 additions & 4 deletions subprojects/catch2.wrap
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[wrap-file]
directory = Catch2-3.7.0
source_url = https://github.com/catchorg/Catch2/archive/refs/tags/v3.7.0.tar.gz
source_filename = v3.7.0.tar.gz
source_hash = 5b10cd536fa3818112a82820ce0787bd9f2a906c618429e7c4dea639983c8e88
directory = Catch2-3.7.1
source_url = https://github.com/catchorg/Catch2/archive/refs/tags/v3.7.1.tar.gz
source_filename = v3.7.1.tar.gz
source_hash = c991b247a1a0d7bb9c39aa35faf0fe9e19764213f28ffba3109388e62ee0269c

[provide]
catch2 = catch2_dep
Expand Down
8 changes: 4 additions & 4 deletions subprojects/fmt.wrap
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[wrap-file]
directory = fmt-10.2.1
source_url = https://github.com/fmtlib/fmt/archive/refs/tags/10.2.1.tar.gz
source_filename = fmt-10.2.1.tar.gz
source_hash = 1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811
directory = fmt-11.0.2
source_url = https://github.com/fmtlib/fmt/archive/refs/tags/11.0.2.tar.gz
source_filename = fmt-11.0.2.tar.gz
source_hash = 6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f
patch_directory = fmt

[provide]
Expand Down
11 changes: 6 additions & 5 deletions subprojects/nlohmann_json.wrap
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[wrap-file]
directory = nlohmann_json-3.11.2
directory = nlohmann_json-3.11.3
lead_directory_missing = true
source_url = https://github.com/nlohmann/json/releases/download/v3.11.2/include.zip
source_filename = nlohmann_json-3.11.2.zip
source_hash = e5c7a9f49a16814be27e4ed0ee900ecd0092bfb7dbfca65b5a421b774dccaaed
wrapdb_version = 3.11.2-1
source_url = https://github.com/nlohmann/json/releases/download/v3.11.3/include.zip
source_filename = nlohmann_json-3.11.3.zip
source_hash = a22461d13119ac5c78f205d3df1db13403e58ce1bb1794edc9313677313f4a9d
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/nlohmann_json_3.11.3-1/nlohmann_json-3.11.3.zip
wrapdb_version = 3.11.3-1

[provide]
nlohmann_json = nlohmann_json_dep
2 changes: 1 addition & 1 deletion subprojects/packagefiles/fmt/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: MIT

project('fmt', 'cpp', version: '10.2.1', license: 'BSD', default_options: ['cpp_std=c++14'])
project('fmt', 'cpp', version: '11.0.2', license: 'BSD', default_options: ['cpp_std=c++14'])

fmt_private_cpp_args = ['-DFMT_USE_FULL_CACHE_DRAGONBOX=1'] # I don't know where this must go, so it is set for both
fmt_interface_cpp_args = ['-DFMT_USE_FULL_CACHE_DRAGONBOX=1'] # I don't know where this must go, so it is set for both
Expand Down
2 changes: 1 addition & 1 deletion subprojects/packagefiles/pybind11/meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('pybind11', 'cpp',
version : '2.13.5',
version : '2.13.6',
license : 'BSD-3-Clause')

pybind11_incdir = include_directories('include')
Expand Down
8 changes: 4 additions & 4 deletions subprojects/pybind11.wrap
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[wrap-file]
directory = pybind11-2.13.5
source_url = https://github.com/pybind/pybind11/archive/refs/tags/v2.13.5.tar.gz
source_filename = pybind11-2.13.5.tar.gz
source_hash = b1e209c42b3a9ed74da3e0b25a4f4cd478d89d5efbb48f04b277df427faf6252
directory = pybind11-2.13.6
source_url = https://github.com/pybind/pybind11/archive/refs/tags/v2.13.6.tar.gz
source_filename = pybind11-2.13.6.tar.gz
source_hash = e08cb87f4773da97fa7b5f035de8763abc656d87d5773e62f6da0587d1f0ec20
patch_directory = pybind11


Expand Down

0 comments on commit c8836cf

Please sign in to comment.