Merge branch 'master' into YearCalendar

Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
2023-01-23 18:42:32 +03:00
parent eb9d2d9c5d
commit ed31b20c26
57 changed files with 799 additions and 477 deletions
--- a/test/config.cpp
+++ b/test/config.cpp
@ -1,6 +1,10 @@
 #include "config.hpp"

-#include <catch2/catch_all.hpp>
+#if __has_include(<catch2/catch_test_macros.hpp>)
+#include <catch2/catch_test_macros.hpp>
+#else
+#include <catch2/catch.hpp>
+#endif

 TEST_CASE("Load simple config", "[config]") {
  waybar::Config conf;