From 2916a5ffaece5f10bb6462d24c6e5d589844736b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 1 Sep 2016 17:22:53 +0200
Subject: Only set cli.options if cli is configured

---
 bpkg/buildfile | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'bpkg/buildfile')

diff --git a/bpkg/buildfile b/bpkg/buildfile
index 0835798..f9fcde9 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -104,22 +104,25 @@ obj{utility}: cxx.poptions += -DBPKG_EXE_SUFFIX='"'$bin.exe.suffix'"'
 {hxx cxx}{repository-signing}: cli{repository-signing}
 {hxx cxx}{repository-signing}: dist = true
 
-# Option length must be the same to get commands/topics/options aligned.
-#
-cli.options += -I $src_root --include-with-brackets --include-prefix bpkg   \
---guard-prefix BPKG --cxx-prologue "#include <bpkg/types-parsers>"          \
+if $cli.configured
+{
+  # Option length must be the same to get commands/topics/options aligned.
+  #
+  cli.options += -I $src_root --include-with-brackets --include-prefix bpkg \
+--guard-prefix BPKG --cxx-prologue "#include <bpkg/types-parsers>" \
 --cli-namespace bpkg::cli --generate-vector-scanner --generate-file-scanner \
---generate-specifier --generate-parse --page-usage 'bpkg::print_$name$_'    \
+--generate-specifier --generate-parse --page-usage 'bpkg::print_$name$_' \
 --ansi-color --include-base-last --option-length 23
 
-cli.cxx{common-options}: cli.options += --short-usage --long-usage # Both.
-cli.cxx{bpkg-options}: cli.options += --short-usage --suppress-undocumented
+  cli.cxx{common-options}: cli.options += --short-usage --long-usage # Both.
+  cli.cxx{bpkg-options}: cli.options += --short-usage --suppress-undocumented
 
-cli.options += --long-usage # All other pages -- long usage.
+  cli.options += --long-usage # All other pages -- long usage.
 
-# Avoid generating CLI runtime and empty inline file for help topics.
-#
-cli.cxx{repository-signing}: cli.options += --suppress-cli --suppress-inline
+  # Avoid generating CLI runtime and empty inline file for help topics.
+  #
+  cli.cxx{repository-signing}: cli.options += --suppress-cli --suppress-inline
+}
 
 # Include generated cli files into the distribution.
 #
-- 
cgit v1.1