Skip to content

Commit aeb8c0a

Browse files
Address Meson warnings
- Increase minimum version to account for current usage - Replace meson.source_root with meson.project_source_root - Replace meson.build_root with meson.project_build_root - Replace get_cross_property with get_external_property
1 parent 7c27b67 commit aeb8c0a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

meson.build

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ subdir('test/')
121121
doxygen_description = 'Memory library for embedded systems (malloc and friends)'
122122

123123
cppcheck_args = [
124-
'-i', meson.source_root() / 'include',
124+
'-i', meson.project_source_root() / 'include',
125125
# Folders to analyze
126-
meson.source_root() / 'src',
127-
meson.source_root() / 'test',
126+
meson.project_source_root() / 'src',
127+
meson.project_source_root() / 'test',
128128
]
129129

130130
clangformat_additional_targets = [
131-
meson.source_root() / 'include',
131+
meson.project_source_root() / 'include',
132132
]
133133

134134
# Include modules
@@ -147,8 +147,8 @@ native_pkg_name = host_pkg_name + '_native'
147147

148148
# These macros allow you to simplify the declaration of includes for common
149149
# include paths.
150-
build_root_include = meson.build_root() + ':@0@'
151-
src_include = meson.build_root() / 'src/:@0@'
150+
build_root_include = meson.project_build_root() + ':@0@'
151+
src_include = meson.project_build_root() / 'src/:@0@'
152152

153153
host_pkg_files = [
154154
build_root_include.format('docs'),

test/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ libmemory_freelist_locking_tests = executable('libmemory_freelist_locking_tests'
5858
# Register Tests with Meson #
5959
#############################
6060

61-
test_output_dir = 'CMOCKA_XML_FILE=' + meson.build_root() + '/test/%g.xml'
61+
test_output_dir = 'CMOCKA_XML_FILE=' + meson.project_build_root() + '/test/%g.xml'
6262

6363
if meson.is_subproject() == false
6464
test('libmemory_freelist_tests',

0 commit comments

Comments
 (0)