From 6af7742c35ecdf2831908443ca0e04bf23317a96 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 11 Jan 2023 19:57:00 +0100 Subject: Rename Configuation struct to configuration and make get/has functions member functions. --- src/rebuild.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/rebuild.cc') diff --git a/src/rebuild.cc b/src/rebuild.cc index 7e5259a..3033a46 100644 --- a/src/rebuild.cc +++ b/src/rebuild.cc @@ -170,17 +170,18 @@ bool recompileCheck(const ctor::settings& global_settings, int argc, char* argv[ getOption(tool_chain, opt::optimization, "3")); append(config.flags.cxxflags, getOption(tool_chain, opt::cpp_std, "c++20")); - if(hasConfiguration(cfg::ctor_includedir)) + const auto& c = ctor::get_configuration(); + if(c.has(cfg::ctor_includedir)) { append(config.flags.cxxflags, getOption(tool_chain, opt::include_path, - getConfiguration(cfg::ctor_includedir))); + c.get(cfg::ctor_includedir))); } - if(hasConfiguration(cfg::ctor_libdir)) + if(c.has(cfg::ctor_libdir)) { append(config.flags.ldflags, getOption(tool_chain, opt::library_path, - getConfiguration(cfg::ctor_libdir))); + c.get(cfg::ctor_libdir))); } append(config.flags.ldflags, getOption(tool_chain, opt::link, "ctor")); append(config.flags.ldflags, getOption(tool_chain, opt::threads)); -- cgit v1.2.3