diff options
Diffstat (limited to 'src/libctor.cc')
| -rw-r--r-- | src/libctor.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/libctor.cc b/src/libctor.cc index a2c873e..21792e1 100644 --- a/src/libctor.cc +++ b/src/libctor.cc @@ -19,8 +19,7 @@ #include <getoptpp/getoptpp.hpp> -#include "libctor.h" -#include "settings.h" +#include "ctor.h" #include "configure.h" #include "rebuild.h" #include "tasks.h" @@ -29,9 +28,10 @@ int main(int argc, char* argv[]) { - Settings settings{}; + ctor::settings settings{}; + const auto& c = ctor::get_configuration(); - settings.builddir = getConfiguration(cfg::builddir, settings.builddir); + settings.builddir = c.get(ctor::cfg::builddir, settings.builddir); settings.parallel_processes = std::max(1u, std::thread::hardware_concurrency()) * 2 - 1; @@ -264,13 +264,13 @@ Options: if(print_configure_cmd) { no_default_build = true; - std::cout << getConfiguration("cmd") << "\n"; + std::cout << c.get("cmd") << "\n"; } if(print_configure_db) { no_default_build = true; - const auto& c = configuration(); + const auto& c = ctor::get_configuration(); for(const auto& config : c.tools) { std::cout << config.first << ": " << config.second << "\n"; @@ -316,7 +316,8 @@ Options: auto& targets = getTargets(settings); for(const auto& target : targets) { - if(target.config.type == TargetType::UnitTest) + if(target.config.type == ctor::target_type::unit_test || + target.config.type == ctor::target_type::unit_test_library) { unittest_targets.push_back(target); } @@ -338,7 +339,8 @@ Options: auto& targets = getTargets(settings); for(const auto& target : targets) { - if(target.config.type != TargetType::UnitTest) + if(target.config.type != ctor::target_type::unit_test && + target.config.type != ctor::target_type::unit_test_library) { non_unittest_targets.push_back(target); } @@ -367,7 +369,8 @@ Options: auto& targets = getTargets(settings); for(const auto& target : targets) { - if(target.config.type != TargetType::UnitTest) + if(target.config.type != ctor::target_type::unit_test && + target.config.type != ctor::target_type::unit_test_library) { non_unittest_targets.push_back(target); } |