From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6F579A0487 for ; Fri, 5 Jul 2019 17:57:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3F19C1BDED; Fri, 5 Jul 2019 17:57:12 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id D9C681B96B; Fri, 5 Jul 2019 17:57:06 +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 orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jul 2019 08:57:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,455,1557212400"; d="scan'208";a="158536268" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga008.jf.intel.com with ESMTP; 05 Jul 2019 08:57:04 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , bluca@debian.org, stable@dpdk.org, alialnu@mellanox.com Date: Fri, 5 Jul 2019 16:56:55 +0100 Message-Id: <20190705155655.31636-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH] doc: fix doc build with latest meson X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The latest versions of meson don't build targets when build_by_default is false but install is true, unlike older versions. We can fix this by having both build_by_default and install settings come from the build-time option. Bugzilla ID: 303 Fixes: d02a2dab2dfb ("doc: support building HTML guides with meson") Fixes: 720b14db3ae2 ("build: generate API documentation with meson") Cc: bluca@debian.org Cc: stable@dpdk.org Cc: alialnu@mellanox.com Reported-by: Ali Alnubani Signed-off-by: Bruce Richardson --- doc/api/meson.build | 4 ++-- doc/guides/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/api/meson.build b/doc/api/meson.build index 30bdc573b..1c48b7672 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -26,7 +26,7 @@ if doxygen.found() command: [generate_examples, '@INPUT@', '@OUTPUT@'], install: get_option('enable_docs'), install_dir: htmldir, - build_by_default: false) + build_by_default: get_option('enable_docs')) cdata = configuration_data() cdata.set('VERSION', meson.project_version()) @@ -48,7 +48,7 @@ if doxygen.found() command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css], install: get_option('enable_docs'), install_dir: htmldir, - build_by_default: false) + build_by_default: get_option('enable_docs')) doc_targets += doxy_build doc_target_names += 'Doxygen_API' diff --git a/doc/guides/meson.build b/doc/guides/meson.build index 06f14882b..7931ef3bb 100644 --- a/doc/guides/meson.build +++ b/doc/guides/meson.build @@ -11,7 +11,7 @@ if sphinx.found() command: [sphinx, '-b', 'html', '-d', meson.current_build_dir() + '/.doctrees', '@INPUT@', meson.current_build_dir() + '/guides'], - build_by_default: false, + build_by_default: get_option('enable_docs'), install: get_option('enable_docs'), install_dir: htmldir) -- 2.21.0