From 17d07c9b494df182dac381ee3287601c79f863cc Mon Sep 17 00:00:00 2001 From: talisein Date: Tue, 31 Oct 2023 15:05:16 -0700 Subject: [PATCH] Update magic-enum dep (#25) * Update magic-enum dep * Use Version 0.9.3 wrap --- meson.build | 3 ++- src/volumes.cpp | 3 ++- subprojects/magic_enum.wrap | 12 ++++++------ test/volumes.cpp | 5 +++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 1ef157e..cb7a3e4 100644 --- a/meson.build +++ b/meson.build @@ -136,7 +136,8 @@ ctre_dep = dependency('ctre', fallback: ['ctre']) magic_enum_dep = dependency('magic_enum', - fallback: ['magic_enum']) + version: '>=0.9.3', + fallback: ['magic_enum']) subdir('src') subdir('test') diff --git a/src/volumes.cpp b/src/volumes.cpp index df5084a..5bed1f4 100644 --- a/src/volumes.cpp +++ b/src/volumes.cpp @@ -3,7 +3,8 @@ #include #include #include "outcome/result.hpp" -#include "magic_enum.hpp" +#include +#include #include "volumes.h" #include "log.h" #include "utils.h" diff --git a/subprojects/magic_enum.wrap b/subprojects/magic_enum.wrap index a33e8ef..182ab28 100644 --- a/subprojects/magic_enum.wrap +++ b/subprojects/magic_enum.wrap @@ -1,10 +1,10 @@ [wrap-file] -directory = magic_enum-0.8.2 -source_url = https://github.com/Neargye/magic_enum/archive/refs/tags/v0.8.2.tar.gz -source_filename = magic_enum-v0.8.2.tar.gz -source_hash = 62bd7034bbbfc3d7806001767d5775ab42f3ff33bb38366e1ceb21102f0dff9a -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/magic_enum_0.8.2-1/magic_enum-v0.8.2.tar.gz -wrapdb_version = 0.8.2-1 +directory = magic_enum-0.9.3 +source_url = https://github.com/Neargye/magic_enum/archive/refs/tags/v0.9.3.tar.gz +source_filename = magic_enum-v0.9.3.tar.gz +source_hash = 3cadd6a05f1bffc5141e5e731c46b2b73c2dbff025e723c8abaa659e0a24f072 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/magic_enum_0.9.3-1/magic_enum-v0.9.3.tar.gz +wrapdb_version = 0.9.3-1 [provide] magic_enum = magic_enum_dep diff --git a/test/volumes.cpp b/test/volumes.cpp index 1322ee8..3170693 100644 --- a/test/volumes.cpp +++ b/test/volumes.cpp @@ -1,9 +1,10 @@ #include +#include +#include +#include #include "volumes.h" #include "omnibus.h" #include "omnibus_defs.h" -#include -#include "magic_enum.hpp" int main() { using namespace boost::ut;