Fix meson warnings
Clean up some variable naming conventions, remove some unused variables.
Change-Id: I87fc4645853b9ce33968863ece0f73cf4bae71fc
Signed-off-by: Ed Tanous <ed@tanous.net>
diff --git a/meson.build b/meson.build
index 1f9287b..2f19d99 100644
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,7 @@
project_description = 'libcper library'
-SectionSources = files(
+section_sources = files(
'sections/cper-section-arm.c',
'sections/cper-section-ccix-per.c',
'sections/cper-section-cxl-component.c',
@@ -35,9 +35,9 @@
'sections/cper-section.c',
)
-EDKSources = files('edk/Cper.c')
+edk_sources = files('edk/Cper.c')
-GeneratorSectionSources = files(
+generator_section_sources = files(
'generator/sections/gen-section-arm.c',
'generator/sections/gen-section-ccix-per.c',
'generator/sections/gen-section-cxl-component.c',
@@ -53,7 +53,6 @@
'generator/sections/gen-section.c',
)
-cmake = import('cmake')
cc = meson.get_compiler('c')
json_c_dep = dependency('json-c', required: true, fallback: ['json-c', 'json_c_dep'])
@@ -72,8 +71,8 @@
libcper_parse = library(
'cper-parse',
libcper_parse_sources,
- SectionSources,
- EDKSources,
+ section_sources,
+ edk_sources,
version: meson.project_version(),
include_directories: include_directories(libcper_include),
c_args: '-Wno-address-of-packed-member',
@@ -93,7 +92,7 @@
libcper_generate = library(
'cper-generate',
libcper_generate_sources,
- GeneratorSectionSources,
+ generator_section_sources,
version: meson.project_version(),
include_directories: include_directories(libcper_include),
dependencies: [
@@ -131,7 +130,7 @@
executable(
'cper-generate',
'generator/cper-generate-cli.c',
- EDKSources,
+ edk_sources,
include_directories: include_directories(libcper_include),
dependencies: [
libcper_generate,
diff --git a/tests/meson.build b/tests/meson.build
index 9efc7ae..87dcf51 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -34,16 +34,12 @@
meson.current_build_dir() / 'specification',
)
-tests = ['cper-tests']
-
-test(
- 'test-cper-tests',
- executable(
- 'cper-tests',
- sources,
- implicit_include_directories: false,
- include_directories: include_directories(test_include_dirs),
- cpp_args: '-fpermissive',
- dependencies: [libcper_parse, libcper_generate, json_c_dep, gtest, gmock],
- ),
+cper_tests = executable(
+ 'cper-tests',
+ sources,
+ implicit_include_directories: false,
+ include_directories: include_directories(test_include_dirs),
+ cpp_args: '-fpermissive',
+ dependencies: [libcper_parse, libcper_generate, json_c_dep, gtest, gmock],
)
+test('test-cper-tests', cper_tests)
\ No newline at end of file