Merge branch 'develop' into SupportKeyspace

.github/actions/prepare_runner/action.yml

@@ -13,18 +13,20 @@ runs:
       if: ${{ runner.os == 'macOS' }}
       shell: bash
       run: |
+        echo "Removing unused packages on macOS, which were previously installed"
+        for pkg in bison gh jq llvm@14 pkg-config; do
+          brew uninstall "$pkg" || true
+        done
+
+        brew list
+
         brew install --quiet \
-          bison \
           ca-certificates \
           ccache \
           clang-build-analyzer \
           cmake \
           conan \
-          gh \
-          jq \
-          llvm@14 \
-          ninja \
-          pkg-config
+          ninja
         echo "/opt/homebrew/opt/conan@2/bin" >> $GITHUB_PATH
 
     - name: Fix git permissions on Linux

CMakeLists.txt

@@ -11,7 +11,7 @@ option(integration_tests "Build integration tests" FALSE)
 option(benchmark "Build benchmarks" FALSE)
 option(docs "Generate doxygen docs" FALSE)
 option(coverage "Build test coverage report" FALSE)
-option(packaging "Create distribution packages" FALSE)
+option(package "Create distribution packages" FALSE)
 option(lint "Run clang-tidy checks during compilation" FALSE)
 option(static "Statically linked Clio" FALSE)
 option(snapshot "Build snapshot tool" FALSE)
@@ -40,11 +40,6 @@ if (verbose)
   set(CMAKE_VERBOSE_MAKEFILE TRUE)
 endif ()
 
-if (packaging)
-  add_definitions(-DPKG=1)
-  target_compile_definitions(clio_options INTERFACE PKG=1)
-endif ()
-
 # Clio tweaks and checks
 include(CheckCompiler)
 include(Settings)

cmake/install/install.cmake

@@ -5,7 +5,7 @@ set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 
 include(GNUInstallDirs)
 
-install(TARGETS clio_server DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS clio_server DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
 file(READ docs/examples/config/example-config.json config)
 string(REGEX REPLACE "./clio_log" "/var/log/clio/" config "${config}")

src/util/log/Logger.cpp

@@ -44,7 +44,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <filesystem>
-#include <iostream>
 #include <memory>
 #include <optional>
 #include <string>