refactor(build): Remove CLP_NEEDS_X flags for marking required dependencies; bump ystdlib to y-scope/ystdlib-cpp@c03806a.

components/core/CMakeLists.txt

@@ -12,8 +12,10 @@ validate_compiler_versions()
 # Include options for CLP build
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/Options/options.cmake")
 
-validate_and_setup_all_clp_dependency_flags()
-convert_clp_dependency_properties_to_variables()
+validate_all_clp_dependency_flags()
+
+# Include utilities to find and configure dependencies
+include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/find_utils.cmake")
 
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set(default_build_type "Release")
@@ -137,195 +139,8 @@ if(PROJECT_IS_TOP_LEVEL)
     endif()
 endif()
 
-if(CLP_NEED_ABSL)
-    find_package(absl REQUIRED)
-    if (absl_FOUND)
-        message(STATUS "Found absl ${absl_VERSION}")
-    endif()
-endif()
-
-# Find and setup ANTLR Library
-if(CLP_NEED_ANTLR)
-    find_package(antlr4-runtime REQUIRED)
-    if (antlr4-runtime_FOUND)
-        message(STATUS "Found antlr4-runtime ${antlr4-runtime_VERSION}")
-    endif()
-endif()
-
-# Find and setup Boost Library
-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()
-endif()
-
-if(CLP_NEED_CATCH2)
-    find_package(Catch2 3.8.0 REQUIRED)
-    message(STATUS "Found Catch2 ${Catch2_VERSION}")
-endif()
-
-if(CLP_NEED_DATE)
-    find_package(date REQUIRED)
-    if (date_FOUND)
-        message(STATUS "Found date ${date_VERSION}")
-    endif()
-endif()
-
-if(CLP_NEED_FMT)
-    find_package(fmt REQUIRED)
-    if(fmt_FOUND)
-        message(STATUS "Found fmt ${fmt_VERSION}")
-    endif()
-endif()
-
-if(CLP_NEED_LOG_SURGEON)
-    find_package(log_surgeon REQUIRED)
-    if(log_surgeon_FOUND)
-        message(STATUS "Found log_surgeon ${log_surgeon_VERSION}")
-    endif()
-endif()
-
-if(CLP_NEED_NLOHMANN_JSON)
-    find_package(nlohmann_json REQUIRED)
-    if(nlohmann_json_FOUND)
-        message(STATUS "Found nlohmann_json ${nlohmann_json_VERSION}")
-    endif()
-endif()
-
-if(CLP_NEED_SIMDJSON)
-    find_package(simdjson REQUIRED)
-    if(simdjson_FOUND)
-        message(STATUS "Found simdjson ${simdjson_VERSION}")
-    endif()
-endif()
-
-if(CLP_NEED_SPDLOG)
-    find_package(spdlog REQUIRED)
-    if(spdlog_FOUND)
-        message(STATUS "Found spdlog ${spdlog_VERSION}")
-    endif()
-endif()
-
-# Find and setup libarchive
-if(CLP_NEED_LIBARCHIVE)
-    if(CLP_USE_STATIC_LIBS)
-        set(LibArchive_USE_STATIC_LIBS ON)
-    endif()
-    find_package(LibArchive REQUIRED)
-    if(LibArchive_FOUND)
-        message(STATUS "Found LibArchive ${LibArchive_VERSION}")
-    else()
-        message(FATAL_ERROR "Could not find ${CLP_LIBS_STRING} libraries for LibArchive")
-    endif()
-endif()
-
-# Find and setup libcurl
-# By default, CURL does not provide static libraries
-if(CLP_NEED_CURL)
-    find_package(CURL 7.61.1 REQUIRED)
-    if(CURL_FOUND)
-        message(STATUS "Found CURL ${CURL_VERSION_STRING}")
-    else()
-        message(FATAL_ERROR "Could not find ${CLP_LIBS_STRING} libraries for CURL")
-    endif()
-endif()
-
-# Find OpenSSL
-if(CLP_NEED_OPENSSL)
-    find_package(OpenSSL REQUIRED)
-    if(OPENSSL_FOUND)
-        message(STATUS "Found OpenSSL (${OPENSSL_VERSION})")
-    else()
-        message(FATAL_ERROR "OpenSSL not found")
-    endif()
-endif()
-
-# Find and setup MariaDBClient library
-if(CLP_NEED_MARIADB)
-    if(CLP_USE_STATIC_LIBS)
-        # NOTE: We can't statically link to MariaDBClient since it's GPL
-        message(AUTHOR_WARNING "MariaDBClient cannot be statically linked due to its license.")
-    endif()
-    find_package(MariaDBClient 3.1.0 REQUIRED)
-    if(MariaDBClient_FOUND)
-        message(STATUS "Found MariaDBClient ${MariaDBClient_VERSION}")
-    else()
-        message(FATAL_ERROR "Could not find ${CLP_LIBS_STRING} libraries for MariaDBClient")
-    endif()
-endif()
-
-# Find and setup mongocxx
-if(CLP_NEED_MONGOCXX)
-    find_package(mongocxx REQUIRED)
-    message(STATUS "Found mongocxx ${mongocxx_VERSION}")
-    if(CLP_USE_STATIC_LIBS)
-        set(MONGOCXX_TARGET mongo::mongocxx_static)
-    else()
-        set(MONGOCXX_TARGET mongo::mongocxx_shared)
-    endif()
-endif()
-
-# Find and setup msgpack
-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()
-endif()
-
 find_package(Threads REQUIRED)
 
-if(CLP_NEED_YAMLCPP)
-    find_package(yaml-cpp REQUIRED)
-    if(yaml-cpp_FOUND)
-        message(STATUS "Found yaml-cpp ${yaml-cpp_VERSION}")
-    endif()
-endif()
-
-# Add ystdlib
-if(CLP_NEED_YSTDLIB)
-    set(YSTDLIB_CPP_BUILD_TESTING OFF)
-    add_subdirectory("${CLP_YSTDLIB_SOURCE_DIRECTORY}" "${CMAKE_BINARY_DIR}/ystdlib" EXCLUDE_FROM_ALL)
-endif()
-
-if(CLP_NEED_ZSTD)
-    # v1.4.8 is the lowest version available in the package managers of the OSes we support.
-    find_package(zstd 1.4.8 REQUIRED)
-    message(STATUS "Found zstd ${zstd_VERSION}")
-    if(CLP_USE_STATIC_LIBS)
-        set(zstd_TARGET zstd::libzstd_static)
-    else()
-        set(zstd_TARGET zstd::libzstd_shared)
-    endif()
-endif()
-
-if(CLP_NEED_LIBLZMA)
-    if(CLP_USE_STATIC_LIBS)
-        set(LibLZMA_ROOT ${LibLZMA-static_ROOT})
-        set(LibLZMA_USE_STATIC_LIBS ON)
-    else()
-        set(LibLZMA_ROOT ${LibLZMA-shared_ROOT})
-    endif()
-    # Version 5.8.1 and above address CVE-2024-3094 and CVE-2025-31115.
-    find_package(LibLZMA 5.8.1 REQUIRED)
-    message(STATUS "Found LibLZMA ${LibLZMA_VERSION}")
-endif()
-
-# sqlite dependencies
-if(CLP_NEED_SQLITE)
-    set(sqlite_DYNAMIC_LIBS "dl;m;pthread")
-    include(cmake/Modules/FindLibraryDependencies.cmake)
-    FindDynamicLibraryDependencies(sqlite "${sqlite_DYNAMIC_LIBS}")
-endif()
-
 add_subdirectory(src/clp/regex_utils)
 add_subdirectory(src/clp/string_utils)
 
@@ -719,6 +534,26 @@ set(SOURCE_FILES_unitTest
         )
 
 if(CLP_BUILD_TESTING)
+    find_package(absl REQUIRED)
+    clp_find_boost()
+    clp_find_catch2()
+    clp_find_curl()
+    find_package(date REQUIRED)
+    find_package(fmt REQUIRED)
+    clp_find_libarchive()
+    find_package(log_surgeon REQUIRED)
+    clp_find_lzma()
+    clp_find_mariadb_client()
+    clp_find_mongocxx()
+    find_package(nlohmann_json REQUIRED)
+    find_package(OpenSSL REQUIRED)
+    find_package(simdjson REQUIRED)
+    find_package(spdlog REQUIRED)
+    clp_find_sqlite()
+    find_package(yaml-cpp REQUIRED)
+    clp_find_ystdlib()
+    clp_find_zstd()
+
     add_executable(unitTest
             ${SOURCE_FILES_unitTest}
             ${SOURCE_FILES_clp_s_unitTest}

components/core/cmake/Modules/FindLZ4.cmake

@@ -0,0 +1,103 @@
+# Try to find LZ4
+#
+# Set LZ4_USE_STATIC_LIBS=ON to look for static libraries.
+#
+# Once done this will define:
+#  LZ4_FOUND - Whether LZ4 was found on the system
+#  LZ4_INCLUDE_DIR - The LZ4 include directories
+#  LZ4_VERSION - The version of LZ4 installed on the system
+#
+# Conventions:
+# - Variables only for use within the script are prefixed with "lz4_"
+# - Variables that should be externally visible are prefixed with "LZ4_"
+
+set(lz4_LIBNAME "lz4")
+
+include("${PROJECT_SOURCE_DIR}/cmake/Modules/FindLibraryDependencies.cmake")
+
+# Run pkg-config
+find_package(PkgConfig)
+pkg_check_modules(lz4_PKGCONF QUIET "lib${lz4_LIBNAME}")
+
+# Set include directory
+find_path(LZ4_INCLUDE_DIR lz4.h
+        HINTS ${lz4_PKGCONF_INCLUDEDIR}
+        PATH_SUFFIXES include
+        )
+
+# Handle static libraries
+if(LZ4_USE_STATIC_LIBS)
+    # Save current value of CMAKE_FIND_LIBRARY_SUFFIXES
+    set(lz4_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+
+    # Temporarily change CMAKE_FIND_LIBRARY_SUFFIXES to static library suffix
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
+endif()
+
+# Find library
+find_library(LZ4_LIBRARY
+        NAMES ${lz4_LIBNAME}
+        HINTS ${lz4_PKGCONF_LIBDIR}
+        PATH_SUFFIXES lib
+        )
+if (LZ4_LIBRARY)
+    # NOTE: This must be set for find_package_handle_standard_args to work
+    set(LZ4_FOUND ON)
+endif()
+
+if(LZ4_USE_STATIC_LIBS)
+    FindStaticLibraryDependencies(${lz4_LIBNAME} lz4 "${lz4_PKGCONF_STATIC_LIBRARIES}")
+
+    # Restore original value of CMAKE_FIND_LIBRARY_SUFFIXES
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ${lz4_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+    unset(lz4_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
+endif()
+
+FindDynamicLibraryDependencies(lz4 "${lz4_DYNAMIC_LIBS}")
+
+# Set version
+set(LZ4_VERSION ${lz4_PKGCONF_VERSION})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LZ4
+        REQUIRED_VARS LZ4_INCLUDE_DIR
+        VERSION_VAR LZ4_VERSION
+        )
+
+if(NOT TARGET LZ4::LZ4)
+    # Add library to build
+    if (LZ4_FOUND)
+        if (LZ4_USE_STATIC_LIBS)
+            add_library(LZ4::LZ4 STATIC IMPORTED)
+        else()
+            # NOTE: We use UNKNOWN so that if the user doesn't have the SHARED
+            # libraries installed, we can still use the STATIC libraries
+            add_library(LZ4::LZ4 UNKNOWN IMPORTED)
+        endif()
+    endif()
+
+    # Set include directories for library
+    if(LZ4_INCLUDE_DIR)
+        set_target_properties(LZ4::LZ4
+                PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${LZ4_INCLUDE_DIR}"
+                )
+    endif()
+
+    # Set location of library
+    if(EXISTS "${LZ4_LIBRARY}")
+        set_target_properties(LZ4::LZ4
+                PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                IMPORTED_LOCATION "${LZ4_LIBRARY}"
+                )
+
+        # Add component's dependencies for linking
+        if(lz4_LIBRARY_DEPENDENCIES)
+            set_target_properties(LZ4::LZ4
+                    PROPERTIES
+                    INTERFACE_LINK_LIBRARIES "${lz4_LIBRARY_DEPENDENCIES}"
+                    )
+        endif()
+    endif()
+endif()

components/core/cmake/Modules/FindLibArchive.cmake

@@ -14,7 +14,7 @@
 
 set(libarchive_LIBNAME "archive")
 
-include(cmake/Modules/FindLibraryDependencies.cmake)
+include("${PROJECT_SOURCE_DIR}/cmake/Modules/FindLibraryDependencies.cmake")
 
 # On macOS, libarchive installed through brew is not linked into prefix by default.
 # So it cannot be found by pkg-config and we need to manually find it.

components/core/cmake/Modules/FindMariaDBClient.cmake

@@ -14,7 +14,7 @@
 
 set(mariadbclient_LIBNAME "mariadb")
 
-include(cmake/Modules/FindLibraryDependencies.cmake)
+include("${PROJECT_SOURCE_DIR}/cmake/Modules/FindLibraryDependencies.cmake")
 
 # Run pkg-config
 find_package(PkgConfig)