Mercurial > irccd
changeset 825:e9da936309df
irccd: fix build without Javascript
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Tue, 08 Jan 2019 20:41:20 +0100 |
| parents | 06cc2f95f479 |
| children | f85faf0f5d70 |
| files | cmake/function/IrccdDefinePlugin.cmake irccd-test/main.cpp plugins/CMakeLists.txt |
| diffstat | 3 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/cmake/function/IrccdDefinePlugin.cmake Tue Jan 08 20:41:20 2019 +0100 +++ b/cmake/function/IrccdDefinePlugin.cmake Tue Jan 08 20:41:20 2019 +0100 @@ -136,6 +136,8 @@ if (NOT IRCCD_WITH_PLUGIN_${PLG_UPPER_NAME}) setg(IRCCD_WITH_PLUGIN_${PLG_UPPER_NAME}_MSG "No (disabled by user)") + elseif (NOT IRCCD_WITH_JS AND PLG_TYPE MATCHES "JS") + setg(IRCCD_WITH_PLUGIN_${PLG_UPPER_NAME}_MSG "No (Javascript disabled)") else () setg(IRCCD_WITH_PLUGIN_${PLG_UPPER_NAME}_MSG "Yes")
--- a/irccd-test/main.cpp Tue Jan 08 20:41:20 2019 +0100 +++ b/irccd-test/main.cpp Tue Jan 08 20:41:20 2019 +0100 @@ -59,8 +59,9 @@ using irccd::daemon::whois_event; using irccd::daemon::dynlib_plugin_loader; -using irccd::js::plugin_loader; -using irccd::js::api; +#if defined(IRCCD_HAVE_JS) +namespace js = irccd::js; +#endif namespace irccd::test { @@ -645,9 +646,9 @@ daemon->plugins().add_loader(std::make_unique<dynlib_plugin_loader>()); #if defined(IRCCD_HAVE_JS) - auto loader = std::make_unique<plugin_loader>(*daemon); + auto loader = std::make_unique<js::plugin_loader>(*daemon); - for (const auto& f : api::registry()) + for (const auto& f : js::api::registry()) loader->get_modules().push_back(f()); daemon->plugins().add_loader(std::move(loader));
--- a/plugins/CMakeLists.txt Tue Jan 08 20:41:20 2019 +0100 +++ b/plugins/CMakeLists.txt Tue Jan 08 20:41:20 2019 +0100 @@ -33,16 +33,13 @@ CACHE INTERNAL "All plugins" ) -if (IRCCD_HAVE_JS) - add_subdirectory(ask) - add_subdirectory(auth) - add_subdirectory(hangman) - add_subdirectory(history) - add_subdirectory(joke) - add_subdirectory(logger) - add_subdirectory(plugin) - add_subdirectory(roulette) - add_subdirectory(tictactoe) -endif () - +add_subdirectory(ask) +add_subdirectory(auth) +add_subdirectory(hangman) +add_subdirectory(history) +add_subdirectory(joke) add_subdirectory(links) +add_subdirectory(logger) +add_subdirectory(plugin) +add_subdirectory(roulette) +add_subdirectory(tictactoe)