Merge branch 'master' of https://github.com/grodansparadis/vscp into …

…HEAD
grodansparadis · Feb 10, 2025 · e306989 · e306989
2 parents d59ae90 + e34f702
commit e306989
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -148,7 +148,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
         )
     else()
         SET(CPACK_DEBIAN_PACKAGE_DEPENDS 
-                "libuuid1, lsb-base (>=4.1+Debian3), libc6-dev (>= 2.14), libstdc++6 (>= 5.2), libgcc1 (>= 1:3.0), libssl-dev (>=1.0.0), libmosquitto-dev (>=1.4.10), libexpat1-dev (>=2.0), libmosquitto-dev, libsystemd-dev, libwrap0-dev (>=7.6), libz-dev")
+                "libuuid1, lsb-base (>=4.1+Debian3), libc6-dev (>= 2.14), libstdc++6 (>= 5.2), libgcc1 (>= 1:3.0), libssl-dev (>=1.0.0), libmosquitto-dev (>=1.4.10), libexpat1-dev (>=2.0), libsystemd-dev, libwrap0-dev (>=7.6), libz-dev")
         SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
         SET(CPACK_DEBIAN_PACKAGE_SECTION "network")
         SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})

diff --git a/third_party/mongoose b/third_party/mongoose
diff --git a/third_party/nlohmann b/third_party/nlohmann
diff --git a/third_party/spdlog b/third_party/spdlog
+2 −12		.github/workflows/macos.yml
+122 −139		CMakeLists.txt
+0 −3		README.md
+0 −3		example/example.cpp
+2 −2		include/spdlog/cfg/env.h
+6 −1		include/spdlog/common.h
+1 −2		include/spdlog/details/file_helper-inl.h
+0 −12		include/spdlog/details/os-inl.h
+0 −4		include/spdlog/details/os.h
+1 −1		include/spdlog/fmt/bin_to_hex.h
+28 −20		include/spdlog/fmt/bundled/args.h
+1,886 −1,770		include/spdlog/fmt/bundled/base.h
+470 −376		include/spdlog/fmt/bundled/chrono.h
+22 −20		include/spdlog/fmt/bundled/color.h
+24 −46		include/spdlog/fmt/bundled/compile.h
+44 −65		include/spdlog/fmt/bundled/format-inl.h
+1,282 −1,089		include/spdlog/fmt/bundled/format.h
+2 −0		include/spdlog/fmt/bundled/locale.h
+55 −43		include/spdlog/fmt/bundled/os.h
+88 −43		include/spdlog/fmt/bundled/ostream.h
+130 −107		include/spdlog/fmt/bundled/printf.h
+130 −98		include/spdlog/fmt/bundled/ranges.h
+47 −74		include/spdlog/fmt/bundled/std.h
+46 −97		include/spdlog/fmt/bundled/xchar.h
+6 −12		include/spdlog/sinks/ansicolor_sink-inl.h
+3 −4		include/spdlog/sinks/ansicolor_sink.h
+0 −6		include/spdlog/sinks/basic_file_sink-inl.h
+0 −1		include/spdlog/sinks/basic_file_sink.h
+1 −1		include/spdlog/sinks/null_sink.h
+0 −6		include/spdlog/sinks/rotating_file_sink-inl.h
+0 −1		include/spdlog/sinks/rotating_file_sink.h
+4 −5		include/spdlog/sinks/stdout_sinks-inl.h
+0 −7		include/spdlog/tweakme.h
+1 −1		include/spdlog/version.h
+1 −5		src/bundled_fmtlib_format.cpp
+5 −2		tests/CMakeLists.txt
+0 −9		tests/test_cfg.cpp
+1 −2		tests/test_custom_callbacks.cpp
+5 −3		tests/test_daily_logger.cpp
+0 −40		tests/test_file_logging.cpp
+0 −35		tests/test_misc.cpp
+1 −2		tests/test_sink.h