diff options
| -rw-r--r-- | ctor.cc | 20 | ||||
| m--------- | libctor | 0 |
2 files changed, 11 insertions, 9 deletions
@@ -6,9 +6,11 @@ #include <string> #include <vector> -int execute(const std::string& command, - const std::vector<std::string>& args, - bool verbose = true); +int execute(const ctor::settings& settings, + const std::string& command, + const std::vector<std::string>& args = {}, + const std::map<std::string, std::string>& env = {}, + bool terminate = false); namespace { @@ -29,9 +31,9 @@ ctor::build_configurations myConfigs(const ctor::settings& settings) "src/mainwindow.cc", "src/viewer.cc", "src/client.cc", - settings.builddir + "/moc_mainwindow.cc", - settings.builddir + "/moc_viewer.cc", - settings.builddir + "/moc_client.cc", + {settings.builddir + "/moc_mainwindow.cc"}, + {settings.builddir + "/moc_viewer.cc"}, + {settings.builddir + "/moc_client.cc"}, }, .flags = { .cxxflags = { @@ -60,8 +62,8 @@ ctor::build_configurations myConfigs(const ctor::settings& settings) const ctor::build_configuration& config, const ctor::settings& settings) { - return execute("/usr/bin/moc", {"-I../src", "-o", output, input}, - settings.verbose > 0); + return execute(settings, "/usr/bin/moc", + {"-I../src", "-o", output, input}); } }; @@ -73,7 +75,7 @@ ctor::build_configurations myConfigs(const ctor::settings& settings) .target = "qookie-cast-client", // output filename .sources = { "src/qookie-cast-client.cc", - settings.builddir + "/moc_qookie-cast-client.cc", + {settings.builddir + "/moc_qookie-cast-client.cc"}, }, .flags = { .cxxflags = { diff --git a/libctor b/libctor -Subproject 321f25af1ba33d8409cd294b4f50d0d3e79cf3b +Subproject f4b6372c1fe8d48aceb853272e0b822b967a56d |