From bf2cf8cd53361826e51e01c2904f6fb4cb7502dc Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 16 Aug 2019 22:39:07 +0300 Subject: Add support for default options files --- build2/b-options.hxx | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'build2/b-options.hxx') diff --git a/build2/b-options.hxx b/build2/b-options.hxx index 3e10901..297e6a4 100644 --- a/build2/b-options.hxx +++ b/build2/b-options.hxx @@ -422,6 +422,12 @@ namespace build2 ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail, ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop); + // Merge options from the specified instance appending/overriding + // them as if they appeared after options in this instance. + // + void + merge (const options&); + // Option accessors. // const bool& @@ -533,6 +539,9 @@ namespace build2 pager_option_specified () const; const bool& + no_default_options () const; + + const bool& help () const; const bool& @@ -593,6 +602,7 @@ namespace build2 bool pager_specified_; strings pager_option_; bool pager_option_specified_; + bool no_default_options_; bool help_; bool version_; }; -- cgit v1.1