From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 897D8C04AB4 for ; Fri, 17 May 2019 12:02:46 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 4B4832082E for ; Fri, 17 May 2019 12:02:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B4832082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 97F1C5F51; Fri, 17 May 2019 14:02:41 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id DE4C75F2E; Fri, 17 May 2019 14:02:37 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2019 05:02:37 -0700 X-ExtLoop1: 1 Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga008.jf.intel.com with ESMTP; 17 May 2019 05:02:36 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: bluca@debian.org, Bruce Richardson , stable@dpdk.org Date: Fri, 17 May 2019 13:02:29 +0100 Message-Id: <20190517120231.15898-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190517120231.15898-1-bruce.richardson@intel.com> References: <20190517114613.7027-1-bruce.richardson@intel.com> <20190517120231.15898-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 1/3] examples: fix install of sample apps if setting not provided X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" While the examples were being installed into the appropriate install path when processing the examples/meson.build file, that file was only processed if the "examples" meson parameter was non-empty. Since we now do more than just build the examples, we need to unconditionally process the file. Fixes: 2daf565f91b5 ("examples: install as part of ninja install") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- examples/meson.build | 4 ++++ meson.build | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/examples/meson.build b/examples/meson.build index 1a6134f12..1995f4dcb 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -19,6 +19,10 @@ foreach ex:all_examples exclude_files: 'meson.build') endforeach +if get_option('examples') == '' + subdir_done() +endif + if get_option('examples').to_lower() == 'all' examples = all_examples allow_skips = true # don't flag an error if we can't build an app diff --git a/meson.build b/meson.build index 46f9c5683..9cad43481 100644 --- a/meson.build +++ b/meson.build @@ -42,10 +42,9 @@ subdir('app') # build docs subdir('doc') -# build any examples explicitly requested - useful for developers -if get_option('examples') != '' - subdir('examples') -endif +# build any examples explicitly requested - useful for developers - and +# install any example code into the appropriate install path +subdir('examples') # build kernel modules if enabled if get_option('enable_kmods') -- 2.21.0