mirror of
https://github.com/ThrowTheSwitch/Unity.git
synced 2026-01-23 00:15:58 +01:00
Merge pull request #618 from troglobyte-coder/master
Updating the Meson build scripts
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
#
|
||||
project('example-4', 'c')
|
||||
|
||||
unity_dep = dependency('unity', fallback : ['unity', 'unity_dep'])
|
||||
unity_dep = dependency('unity')
|
||||
|
||||
subdir('src')
|
||||
subdir('test')
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
[wrap-git]
|
||||
directory = unity
|
||||
url = https://github.com/ThrowTheSwitch/Unity.git
|
||||
revision = head
|
||||
|
||||
[provide]
|
||||
unity = unity_dep
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user