3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-23 00:15:58 +01:00
Code Issues Releases Wiki Activity

Merge pull request #618 from troglobyte-coder/master

Browse Source 
Updating the Meson build scripts
This commit is contained in:
Mark VanderVoord
2022-06-19 12:27:18 -04:00
committed by GitHub
parent 1958b97701 193f130aed
commit 57e08575c2
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example_4/meson.build
View File

@@ -6,7 +6,7 @@
# #
project('example-4', 'c') project('example-4', 'c')
unity_dep = dependency('unity', fallback : ['unity', 'unity_dep']) unity_dep = dependency('unity')
subdir('src') subdir('src')
subdir('test') subdir('test')

4
examples/example_4/subprojects/unity.wrap
View File

@@ -1,4 +1,6 @@
[wrap-git] [wrap-git]
directory = unity
url = https://github.com/ThrowTheSwitch/Unity.git url = https://github.com/ThrowTheSwitch/Unity.git
revision = head revision = head
[provide]
unity = unity_dep

8
meson.build
View File

@@ -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. # github repo author: Mike Karlesky, Mark VanderVoord, Greg Williams.
# #
# license: MIT # license: MIT
# #
project('unity', 'c', project('unity', 'c',
license: 'MIT', meson_version: '>=0.62.0',
meson_version: '>=0.53.0', default_options: ['werror=true', 'c_std=c11'])
default_options: ['werror=true', 'c_std=c11']
)
subdir('src') subdir('src')
unity_dep = declare_dependency(link_with: unity_lib, include_directories: unity_dir) unity_dep = declare_dependency(link_with: unity_lib, include_directories: unity_dir)

6
src/meson.build
View File

@@ -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. # github repo author: Mike Karlesky, Mark VanderVoord, Greg Williams.
# #
# license: MIT # license: MIT
# #
unity_dir = include_directories('.') unity_dir = include_directories('.')
unity_lib = static_library(meson.project_name(), unity_lib = static_library(meson.project_name(),
files('unity.c'), 'unity.c',
include_directories: unity_dir) include_directories: unity_dir)