Fix CI build issues
Update to latest .clang-format
Update to C++23 which is required for some dependencies which requires
meson >1.1.1
Change-Id: I45ee122e2e95595ae78462d32e16da288fb67008
Signed-off-by: Jason M. Bills <jason.m.bills@intel.com>
diff --git a/meson.build b/meson.build
index 18f4f42..948958d 100644
--- a/meson.build
+++ b/meson.build
@@ -4,35 +4,41 @@
default_options: [
'warning_level=3',
'werror=true',
- 'cpp_std=c++20' #highly suspect there should be more entries tied to line 4-6 of CMakeLists.txt.old
+ 'cpp_std=c++23', #highly suspect there should be more entries tied to line 4-6 of CMakeLists.txt.old
],
license: 'Apache-2.0',
version: '0.1',
- meson_version: '>=0.64.0',
+ meson_version: '>=1.1.1',
)
-add_project_arguments('-Wno-psabi', #no idea what this line is about or where it came from
+add_project_arguments(
+ '-Wno-psabi', #no idea what this line is about or where it came from
'-DBOOST_ERROR_CODE_HEADER_ONLY',
'-DBOOST_SYSTEM_NO_DEPRECATED',
'-DBOOST_ALL_NO_LIB',
'-DBOOST_NO_RTTI',
'-DBOOST_NO_TYPEID',
'-DBOOST_ASIO_DISABLE_THREADS',
- language: 'cpp')
+ language: 'cpp',
+)
-boost = dependency('boost', version: '>=1.75.0', include_type: 'system', required : true)
-sdbusplus = dependency('sdbusplus', include_type: 'system', required : true)
-dbusinterface = dependency('phosphor-dbus-interfaces', include_type: 'system', required : true)
-phosphor_logging_dep = dependency('phosphor-logging', required : true)
+boost = dependency(
+ 'boost',
+ version: '>=1.75.0',
+ include_type: 'system',
+ required: true,
+)
+sdbusplus = dependency('sdbusplus', include_type: 'system', required: true)
+dbusinterface = dependency(
+ 'phosphor-dbus-interfaces',
+ include_type: 'system',
+ required: true,
+)
+phosphor_logging_dep = dependency('phosphor-logging', required: true)
-default_deps =[
- boost,
- phosphor_logging_dep,
- sdbusplus,
- dbusinterface,
- ]
-
+default_deps = [boost, phosphor_logging_dep, sdbusplus, dbusinterface]
+
incdir = include_directories('include')
subdir('src')
subdir('include')
-subdir('service_files')
\ No newline at end of file
+subdir('service_files')