aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2019-11-05 21:54:11 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2019-11-05 21:54:11 +0200
commit9d62150b40ca9cb28c8150aacbaf6575831b5329 (patch)
tree16f295649792681ab8c94cf5b20d12850a462e9a
parentMove lib/webprofile into src/webengine (diff)
downloadsmolbote-9d62150b40ca9cb28c8150aacbaf6575831b5329.tar.xz
Fix manpages not disabled when disabled by meson
-rw-r--r--doc/meson.build5
-rw-r--r--src/main.cpp11
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/meson.build b/doc/meson.build
index 95ca486..26e5d6c 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,5 +1,7 @@
scdoc = find_program('scdoc', required: get_option('manpage'), disabler: true)
-sh = find_program('sh', required: get_option('manpage'), native: true, disabler: true)
+if scdoc.found()
+
+sh = find_program('sh', required: true, native: true, disabler: true)
man_files = ['man/smolbote.1.scd', 'man/smolbote.5.scd']
@@ -28,3 +30,4 @@ foreach input : man_files
)
endforeach
+endif # manpage
diff --git a/src/main.cpp b/src/main.cpp
index 28887b9..4d4fa8d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,6 +8,7 @@
#include "browser.h"
#include "builtins.h"
+#include "conf.hpp"
#include "configuration.h"
#include "crashhandler.h"
#include "session/session.h"
@@ -16,14 +17,13 @@
#include "version.h"
#include <QFile>
#include <QPluginLoader>
+#include <QStandardPaths>
#include <args.hxx>
#include <iostream>
#include <memory>
#include <plugininterface.h>
#include <pluginloader.h>
#include <spdlog/spdlog.h>
-#include "conf.hpp"
-#include <QStandardPaths>
typedef std::function<void(const std::string &, std::vector<std::string>::const_iterator, std::vector<std::string>::const_iterator)> subcommand_func;
typedef std::unordered_map<std::string, subcommand_func> command_map;
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
args::PositionalList<std::string> cmd_args(parser, "URL(s)", "List of URLs to open");
try {
- /*auto next = */parser.ParseArgs(args);
+ /*auto next = */ parser.ParseArgs(args);
if(cmd_version)
return builtins::version();
@@ -118,7 +118,6 @@ int main(int argc, char **argv)
spdlog::debug("Opening config file {}", config_path);
init_conf(config_path);
-
QVector<QPluginLoader *> plugins;
CommandHash_t pluginCommands;
@@ -139,7 +138,7 @@ int main(int argc, char **argv)
spdlog::warn("{}", qUtf8Printable(loader->errorString()));
delete loader;
}
- }
+ }
}();
// argc, argv, allowSecondary
@@ -168,7 +167,7 @@ int main(int argc, char **argv)
spdlog::debug("Installed breakpad exception handler (path {})", crashpath);
#endif // CONFIG_USEBREAKPAD
- const auto profile = [](){
+ const auto profile = []() {
Configuration c;
return c.value<QString>("profile.default").value();
}();