build(deps): Migrate Boost and msgpack-cxx dependencies to task-based installation (fixes #1243); Drop required Boost version back to 1.81; Add missing ZStd CMake target links. (#1254)

Co-authored-by: kirkrodrigues <[email protected]>

Author: Bill-hbrhbr

components/core/CMakeLists.txt

@@ -157,12 +157,18 @@ if(CLP_NEED_BOOST)
     if(CLP_USE_STATIC_LIBS)
         set(Boost_USE_STATIC_LIBS ON)
     endif()
-    find_package(Boost 1.89 REQUIRED iostreams program_options filesystem regex url)
-    if(Boost_FOUND)
-        message(STATUS "Found Boost ${Boost_VERSION}")
-    else()
-        message(FATAL_ERROR "Could not find ${CLP_LIBS_STRING} libraries for Boost")
-    endif()
+    find_package(
+        Boost
+        1.81...1.88
+        REQUIRED
+            filesystem
+            iostreams
+            program_options
+            regex
+            system
+            url
+    )
+    message(STATUS "Found Boost ${Boost_VERSION}")
 endif()
 
 if(CLP_NEED_CATCH2)
@@ -271,14 +277,10 @@ if(CLP_NEED_MONGOCXX)
     endif()
 endif()
 
-# Find and setup msgpack
+# Find and setup msgpack-cxx
 if(CLP_NEED_MSGPACKCXX)
     find_package(msgpack-cxx 7.0.0 REQUIRED)
-    if(msgpack-cxx_FOUND)
-        message(STATUS "Found msgpack-cxx ${msgpack-cxx_VERSION}")
-    else()
-        message(FATAL_ERROR "Could not find msgpack-cxx")
-    endif()
+    message(STATUS "Found msgpack-cxx ${msgpack-cxx_VERSION}")
 endif()
 
 find_package(Threads REQUIRED)
@@ -731,7 +733,11 @@ if(CLP_BUILD_TESTING)
     target_link_libraries(unitTest
             PRIVATE
             absl::flat_hash_map
-            Boost::filesystem Boost::iostreams Boost::program_options Boost::regex Boost::url
+            Boost::filesystem
+            Boost::iostreams
+            Boost::program_options
+            Boost::regex
+            Boost::url
             Catch2::Catch2WithMain
             ${CURL_LIBRARIES}
             clp_s::search::ast
@@ -745,6 +751,7 @@ if(CLP_BUILD_TESTING)
             LibLZMA::LibLZMA
             MariaDBClient::MariaDBClient
             ${MONGOCXX_TARGET}
+            msgpack-cxx
             nlohmann_json::nlohmann_json
             simdjson::simdjson
             spdlog::spdlog

components/core/cmake/Options/options.cmake

@@ -284,6 +284,7 @@ function(set_clp_s_json_constructor_dependencies)
         CLP_NEED_FMT
         CLP_NEED_MONGOCXX
         CLP_NEED_SPDLOG
+        CLP_NEED_ZSTD
     )
 endfunction()
 

components/core/src/clp/clg/CMakeLists.txt

@@ -144,6 +144,7 @@ if(CLP_BUILD_EXECUTABLES)
                 fmt::fmt
                 log_surgeon::log_surgeon
                 MariaDBClient::MariaDBClient
+                msgpack-cxx
                 nlohmann_json::nlohmann_json
                 spdlog::spdlog
                 ${sqlite_LIBRARY_DEPENDENCIES}

components/core/src/clp/clp/CMakeLists.txt

@@ -185,6 +185,7 @@ if(CLP_BUILD_EXECUTABLES)
                 ${sqlite_LIBRARY_DEPENDENCIES}
                 LibArchive::LibArchive
                 MariaDBClient::MariaDBClient
+                msgpack-cxx
                 nlohmann_json::nlohmann_json
                 ${STD_FS_LIBS}
                 clp::string_utils

components/core/src/clp_s/CMakeLists.txt

@@ -18,7 +18,7 @@ set(
         ../clp/cli_utils.hpp
         ../clp/Defs.h
         ../clp/EncodedVariableInterpreter.cpp
-        ../clp/EncodedVariableInterpreter.hpp    
+        ../clp/EncodedVariableInterpreter.hpp
         ../clp/ErrorCode.hpp
         ../clp/ffi/encoding_methods.cpp
         ../clp/ffi/encoding_methods.hpp
@@ -69,15 +69,15 @@ set(
         ../clp/ir/parsing.inc
         ../clp/ir/types.hpp
         ../clp/LogSurgeonReader.cpp
-        ../clp/LogSurgeonReader.hpp    
+        ../clp/LogSurgeonReader.hpp
         ../clp/NetworkReader.cpp
         ../clp/NetworkReader.hpp
         ../clp/networking/socket_utils.cpp
         ../clp/networking/socket_utils.hpp
         ../clp/Query.cpp
         ../clp/Query.hpp
         ../clp/QueryToken.cpp
-        ../clp/QueryToken.hpp    
+        ../clp/QueryToken.hpp
         ../clp/ReaderInterface.cpp
         ../clp/ReaderInterface.hpp
         ../clp/ReadOnlyMemoryMappedFile.cpp
@@ -115,6 +115,7 @@ if(CLP_BUILD_CLP_S_CLP_DEPENDENCIES)
                 clp::string_utils
                 log_surgeon::log_surgeon
                 ystdlib::containers
+                ${zstd_TARGET}
                 PRIVATE
                 Boost::regex
                 ${CURL_LIBRARIES}
@@ -124,7 +125,6 @@ if(CLP_BUILD_CLP_S_CLP_DEPENDENCIES)
                 OpenSSL::Crypto
                 spdlog::spdlog
                 ystdlib::error_handling
-                ${zstd_TARGET}
         )
 endif()
 
@@ -354,6 +354,7 @@ if(CLP_BUILD_CLP_S_JSONCONSTRUCTOR)
                 clp_s_json_constructor
                 PUBLIC
                 clp_s::archive_reader
+                ${zstd_TARGET}
                 PRIVATE
                 fmt::fmt
                 ${MONGOCXX_TARGET}

components/core/src/clp_s/indexer/CMakeLists.txt

@@ -15,7 +15,7 @@ set(
         ../../clp/database_utils.hpp
         ../../clp/Defs.h
         ../../clp/EncodedVariableInterpreter.cpp
-        ../../clp/EncodedVariableInterpreter.hpp 
+        ../../clp/EncodedVariableInterpreter.hpp
         ../../clp/ErrorCode.hpp
         ../../clp/ffi/encoding_methods.cpp
         ../../clp/ffi/encoding_methods.hpp
@@ -118,6 +118,7 @@ if(CLP_BUILD_EXECUTABLES)
                 clp::string_utils
                 date::date
                 MariaDBClient::MariaDBClient
+                msgpack-cxx
                 nlohmann_json::nlohmann_json
                 OpenSSL::Crypto
                 simdjson::simdjson

components/core/src/reducer/CMakeLists.txt

@@ -44,6 +44,7 @@ if(CLP_BUILD_EXECUTABLES)
         target_link_libraries(reducer-server
                 PRIVATE
                 Boost::program_options
+                Boost::system
                 clp::string_utils
                 fmt::fmt
                 ${MONGOCXX_TARGET}

components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh

@@ -9,8 +9,4 @@ set -u
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 lib_install_scripts_dir="${script_dir}/.."
 
-# NOTE: The remaining installation scripts depend on boost, so we install it beforehand.
-"${lib_install_scripts_dir}/install-boost.sh" 1.89.0
-
 "${lib_install_scripts_dir}/liblzma.sh" 5.8.1
-"${lib_install_scripts_dir}/msgpack.sh" 7.0.0

components/core/tools/scripts/lib_install/install-boost.sh

@@ -27,15 +27,13 @@ if ! command -v uv ; then
 fi
 
 brew install \
-  boost \
   coreutils \
   gcc \
   java11 \
   libarchive \
   llvm@16 \
   lz4 \
   mariadb-connector-c \
-  msgpack-cxx \
   xz \
   zstd