diff --git a/examples/example_4/meson.build b/examples/example_4/meson.build index f06c3fe..862e231 100644 --- a/examples/example_4/meson.build +++ b/examples/example_4/meson.build @@ -6,7 +6,7 @@ # project('example-4', 'c') -unity_dep = dependency('unity', fallback : ['unity', 'unity_dep']) +unity_dep = dependency('unity') subdir('src') subdir('test') diff --git a/examples/example_4/subprojects/unity.wrap b/examples/example_4/subprojects/unity.wrap index f2e54c8..8688475 100755 --- a/examples/example_4/subprojects/unity.wrap +++ b/examples/example_4/subprojects/unity.wrap @@ -1,4 +1,6 @@ [wrap-git] -directory = unity url = https://github.com/ThrowTheSwitch/Unity.git revision = head + +[provide] +unity = unity_dep diff --git a/meson.build b/meson.build index f5c5cfa..4b9f6e7 100644 --- a/meson.build +++ b/meson.build @@ -1,14 +1,12 @@ # -# build script written by : Michael Brockus. +# build script written by : Michael Gene Brockus. # github repo author: Mike Karlesky, Mark VanderVoord, Greg Williams. # # license: MIT # project('unity', 'c', - license: 'MIT', - meson_version: '>=0.53.0', - default_options: ['werror=true', 'c_std=c11'] -) + meson_version: '>=0.62.0', + default_options: ['werror=true', 'c_std=c11']) subdir('src') unity_dep = declare_dependency(link_with: unity_lib, include_directories: unity_dir) diff --git a/src/meson.build b/src/meson.build index 1c7b426..c165afe 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,11 +1,11 @@ # -# build script written by : Michael Brockus. +# build script written by : Michael Gene Brockus. # github repo author: Mike Karlesky, Mark VanderVoord, Greg Williams. # # license: MIT # unity_dir = include_directories('.') -unity_lib = static_library(meson.project_name(), - files('unity.c'), +unity_lib = static_library(meson.project_name(), + 'unity.c', include_directories: unity_dir)