From fcbde46b0082b4c571392ea9b6427f5e11941393 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 25 Jan 2025 16:06:12 +0000 Subject: [PATCH] meson: run `meson format` --- meson.build | 34 +++++++++----------- src/meson.build | 83 ++++++++++++++++++++++--------------------------- 2 files changed, 52 insertions(+), 65 deletions(-) diff --git a/meson.build b/meson.build index 8537718..eb9f16e 100644 --- a/meson.build +++ b/meson.build @@ -2,12 +2,12 @@ # See COPYING for more information about licensing # -project('nethogs', - ['c', 'cpp'], - default_options : ['warning_level=3', - 'cpp_std=c++14'], - version : run_command('./determineVersion.sh').stdout().strip(), - ) +project( + 'nethogs', + ['c', 'cpp'], + default_options: ['warning_level=3', 'cpp_std=c++14'], + version: run_command('./determineVersion.sh').stdout().strip(), +) cc = meson.get_compiler('cpp') @@ -18,17 +18,12 @@ cc = meson.get_compiler('cpp') projectinc = [include_directories('.', 'src')] # flags -c_args = [ - '-DVERSION="' + meson.project_version() + '"' -] +c_args = ['-DVERSION="' + meson.project_version() + '"'] # dependencies thread_dep = dependency('threads', required: true) libpcap_dep = dependency('libpcap', required: true) -project_deps = [ - thread_dep, - libpcap_dep -] +project_deps = [thread_dep, libpcap_dep] ############################# ## Code Compilation ## @@ -39,10 +34,11 @@ subdir('src') ## Pkgconfig definition ## ############################# if get_option('enable-libnethogs').enabled() - pkgconfig = import('pkgconfig') - pkgconfig_install_dir = join_paths(get_option('libdir'), 'pkgconfig') - pkgconfig.generate(libnethogs, - requires: ['libpcap'], - version: meson.project_version() - ) + pkgconfig = import('pkgconfig') + pkgconfig_install_dir = join_paths(get_option('libdir'), 'pkgconfig') + pkgconfig.generate( + libnethogs, + requires: ['libpcap'], + version: meson.project_version(), + ) endif diff --git a/src/meson.build b/src/meson.build index 03f1b58..1329df4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -3,65 +3,56 @@ # sources = [ - files([ - 'connection.cpp', - 'conninode.cpp', - 'decpcap.c', - 'devices.cpp', - 'inode2prog.cpp', - 'packet.cpp', - 'process.cpp', - ]) + files( + 'connection.cpp', + 'conninode.cpp', + 'decpcap.c', + 'devices.cpp', + 'inode2prog.cpp', + 'packet.cpp', + 'process.cpp', + ), ] # --- Executable Compilation --- if get_option('enable-nethogs-app').enabled() - app_sources = [ - files([ - 'main.cpp', - 'cui.cpp', - ]) - ] + app_sources = [files('cui.cpp', 'main.cpp')] - cursespp_dep = dependency('ncurses++', required: true) - curses_dep = dependency('ncurses', required: true) + cursespp_dep = dependency('ncurses++', required: true) + curses_dep = dependency('ncurses', required: true) - executable('nethogs', - [app_sources + sources], - include_directories: [projectinc], - cpp_args: c_args, - c_args: c_args, - install: true, - dependencies : [project_deps, cursespp_dep, curses_dep] - ) + executable( + 'nethogs', + [app_sources + sources], + include_directories: [projectinc], + cpp_args: c_args, + c_args: c_args, + install: true, + dependencies: [project_deps, cursespp_dep, curses_dep], + ) endif # --- Library Compilation --- if get_option('enable-libnethogs').enabled() - lib_sources = [ - files([ - 'libnethogs.cpp', - ]) - ] + lib_sources = [files('libnethogs.cpp')] - libnethogs = shared_library('libnethogs' , - sources + lib_sources, - cpp_args: c_args, - c_args: c_args, - install: true, - soversion: meson.project_version(), - include_directories: [projectinc], - dependencies: [project_deps] - ) - - libnethogs_dep = declare_dependency(link_with: libnethogs) + libnethogs = shared_library( + 'libnethogs' , + sources + lib_sources, + cpp_args: c_args, + c_args: c_args, + install: true, + soversion: meson.project_version(), + include_directories: [projectinc], + dependencies: [project_deps], + ) - # --- Header Installation --- + libnethogs_dep = declare_dependency(link_with: libnethogs) - lib_headers = [ - files('libnethogs.h'), - ] - install_headers(lib_headers, subdir : 'libnethogs') + # --- Header Installation --- + + lib_headers = [files('libnethogs.h')] + install_headers(lib_headers, subdir: 'libnethogs') endif