diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2019-08-16 22:39:07 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-08-17 13:07:36 +0300 |
commit | bf2cf8cd53361826e51e01c2904f6fb4cb7502dc (patch) | |
tree | 534dc598757f42e6daff0107f4bfe533d6bf27a5 /build2/b-options.hxx | |
parent | 3712363ddf1be71b38321d2dde57d88f01a28afb (diff) |
Add support for default options files
Diffstat (limited to 'build2/b-options.hxx')
-rw-r--r-- | build2/b-options.hxx | 10 |
1 files changed, 10 insertions, 0 deletions
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_; }; |