diff --git a/README.md b/README.md index 57ca902..5d47692 100644 --- a/README.md +++ b/README.md @@ -632,6 +632,5 @@ revision = origin/master ``` Then simply fetch the dependency and it is ready to be used: ```meson -ssp_sub = subproject('ssp') -ssp_dep = ssp_sub.get_variable('ssp_dep') +ssp_dep = dependency('ssp') ``` diff --git a/meson.build b/meson.build index b1624e1..d365309 100644 --- a/meson.build +++ b/meson.build @@ -2,16 +2,19 @@ project('ssp', 'cpp', default_options : ['warning_level=3', 'cpp_std=c++17', - 'buildtype=debugoptimized']) + 'buildtype=debugoptimized'], + meson_version:'>=0.54.0') -fast_float_sub = subproject('fast_float') -fast_float_dep = fast_float_sub.get_variable('fast_float_dep') +fast_float_dep = dependency('fast_float') ssp_dep = declare_dependency( include_directories: include_directories('include'), dependencies: fast_float_dep ) +meson.override_dependency('ssp', ssp_dep) + if not meson.is_subproject() subdir('test') endif + diff --git a/test/meson.build b/test/meson.build index e2d33b1..ddfc5d4 100644 --- a/test/meson.build +++ b/test/meson.build @@ -7,8 +7,7 @@ test_sources = files([ 'test_extractions_without_fast_float.cpp', ]) -doctest_proj = subproject('doctest') -doctest_dep = doctest_proj.get_variable('doctest_dep') +doctest_dep = dependency('doctest') test_exe = executable( 'test_ssp', diff --git a/test/test_helpers.hpp b/test/test_helpers.hpp index 06ea703..379f288 100644 --- a/test/test_helpers.hpp +++ b/test/test_helpers.hpp @@ -1,12 +1,7 @@ #pragma once #include #include - -#ifdef CMAKE_GITHUB_CI #include -#else -#include -#endif struct buffer { char* data_{nullptr}; diff --git a/test/test_main.cpp b/test/test_main.cpp index b8e3a4b..0a3f254 100644 --- a/test/test_main.cpp +++ b/test/test_main.cpp @@ -1,2 +1,2 @@ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN -#include +#include