DPDK patches and discussions
 help / color / mirror / Atom feed
* [PATCH 1/2] build: allow to conditionally build apps
@ 2022-10-12 14:47 Markus Theil
  2022-10-12 14:47 ` [PATCH 2/2] build: export dpdk_includes for subproject usage Markus Theil
                   ` (4 more replies)
  0 siblings, 5 replies; 22+ messages in thread
From: Markus Theil @ 2022-10-12 14:47 UTC (permalink / raw)
  To: dev; +Cc: Bruce Richardson, Markus Theil

Makes apps configureable from meson, like already
possible for drivers.

Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
---
 app/meson.build   | 17 ++++++++++++-----
 meson_options.txt |  4 ++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/meson.build b/app/meson.build
index 93d8c15032..4d9c8ee814 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
+enabled_apps = get_option('enable_apps')
+disabled_apps = get_option('disable_apps')
+
 apps = [
         'dumpcap',
         'pdump',
@@ -27,7 +30,11 @@ if get_option('default_library') == 'static' and not is_windows
 endif
 
 foreach app:apps
-    build = true
+    build = enabled_apps == '' or enabled_apps.contains(app)
+    # let disabled_apps override enabled_apps
+    if disabled_apps != ''
+        build = build and not disabled_apps.contains(app)
+    endif
     name = app
     sources = []
     includes = []
@@ -41,6 +48,10 @@ foreach app:apps
     ext_deps = []
     deps = []
 
+    if not build
+        continue
+    endif
+
     subdir(name)
 
     if build
@@ -56,10 +67,6 @@ foreach app:apps
         endforeach
     endif
 
-    if not build
-        continue
-    endif
-
     link_libs = []
     if get_option('default_library') == 'static'
         link_libs = dpdk_static_libraries + dpdk_drivers
diff --git a/meson_options.txt b/meson_options.txt
index 0574dd0fff..9f032d454d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,6 +6,8 @@ option('cpu_instruction_set', type: 'string', value: 'auto',
 	description: 'Set the target machine ISA (instruction set architecture). Will be set according to the platform option by default.')
 option('developer_mode', type: 'feature', description:
        'turn on additional build checks relevant for DPDK developers')
+option('disable_apps', type: 'string', value: '', description:
+       'Comma-separated list of apps to explicitly disable.')
 option('disable_drivers', type: 'string', value: '', description:
        'Comma-separated list of drivers to explicitly disable.')
 option('disable_libs', type: 'string', value: 'kni', description:
@@ -14,6 +16,8 @@ option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>', d
        'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
 option('enable_docs', type: 'boolean', value: false, description:
        'build documentation')
+option('enable_apps', type: 'string', value: '', description:
+       'Comma-separated list of apps to build. If unspecified, build all apps.')
 option('enable_drivers', type: 'string', value: '', description:
        'Comma-separated list of drivers to build. If unspecified, build all drivers.')
 option('enable_driver_sdk', type: 'boolean', value: false, description:
-- 
2.38.0


^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2022-10-28 12:32 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-12 14:47 [PATCH 1/2] build: allow to conditionally build apps Markus Theil
2022-10-12 14:47 ` [PATCH 2/2] build: export dpdk_includes for subproject usage Markus Theil
2022-10-12 15:21   ` Bruce Richardson
2022-10-13 15:12     ` Markus Theil
2022-10-12 15:19 ` [PATCH 1/2] build: allow to conditionally build apps Bruce Richardson
2022-10-13 15:11   ` Markus Theil
2022-10-13 16:36     ` Bruce Richardson
2022-10-13 15:31 ` [PATCH v2 " Markus Theil
2022-10-13 15:31   ` [PATCH v2 2/2] build: export dpdk_includes for subproject usage Markus Theil
2022-10-13 15:41     ` Stephen Hemminger
2022-10-13 15:35 ` [PATCH v3 1/2] build: allow to conditionally build apps Markus Theil
2022-10-14  7:51   ` [PATCH v4 " Markus Theil
2022-10-14  7:51     ` [PATCH v4 2/2] build: export dpdk_includes for subproject usage Markus Theil
2022-10-14  8:45       ` Bruce Richardson
2022-10-14  8:44     ` [PATCH v4 1/2] build: allow to conditionally build apps Bruce Richardson
2022-10-28 12:31       ` David Marchand
2022-10-27 13:13     ` David Marchand
2022-10-27 14:22       ` David Marchand
2022-10-28  6:43         ` Markus Theil
2022-10-13 15:35 ` [PATCH v3 2/2] build: export dpdk_includes for subproject usage Markus Theil
2022-10-13 16:38   ` Bruce Richardson
2022-10-14  7:56     ` Markus Theil

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).