restore cmakelists order to reduce clutter

Author: Bill-hbrhbr

components/core/CMakeLists.txt

@@ -12,8 +12,6 @@ validate_compiler_versions()
 # Include options for CLP build
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/Options/options.cmake")
 
-include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindLibraryDependencies.cmake")
-
 validate_and_setup_all_clp_dependency_flags()
 convert_clp_dependency_properties_to_variables()
 
@@ -348,6 +346,7 @@ 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()
 
@@ -758,29 +757,29 @@ if(CLP_BUILD_TESTING)
             ${CLP_SQLITE3_INCLUDE_DIRECTORY}
             )
     target_link_libraries(unitTest
-            PRIVATE
-            ${CURL_LIBRARIES}
-            ${MONGOCXX_TARGET}
-            ${sqlite_LIBRARY_DEPENDENCIES}
-            ${STD_FS_LIBS}
+	    PRIVATE
             absl::flat_hash_map
             Boost::filesystem Boost::iostreams Boost::program_options Boost::regex Boost::url
             Catch2::Catch2
-            clp::regex_utils
-            clp::string_utils
+            ${CURL_LIBRARIES}
             clp_s::search::ast
             clp_s::search::kql
             clp_s::search::sql
             clp_s::timestamp_pattern
             date::date
             fmt::fmt
-            LibArchive::LibArchive
             log_surgeon::log_surgeon
+            LibArchive::LibArchive
             MariaDBClient::MariaDBClient
+            ${MONGOCXX_TARGET}
             nlohmann_json::nlohmann_json
-            OpenSSL::Crypto
             simdjson::simdjson
             spdlog::spdlog
+            OpenSSL::Crypto
+            ${sqlite_LIBRARY_DEPENDENCIES}
+            ${STD_FS_LIBS}
+            clp::regex_utils
+            clp::string_utils
             yaml-cpp
             ystdlib::containers
             ystdlib::error_handling

components/core/cmake/Modules/FindLibArchive.cmake

@@ -12,11 +12,11 @@
 # - Variables only for use within the script are prefixed with "libarchive_"
 # - Variables that should be externally visible are prefixed with "LibArchive_"
 
+include(cmake/Modules/FindLibraryDependencies.cmake)
+
 set(libarchive_LIBNAME "archive")
 set(libarchive_PKGCONFIG_DIR "${LibArchive_ROOT}/lib/pkgconfig")
 
-include(cmake/Modules/FindLibraryDependencies.cmake)
-
 # Run pkg-config
 find_package(PkgConfig)
 set(ENV{PKG_CONFIG_PATH} "${libarchive_PKGCONFIG_DIR};$ENV{PKG_CONFIG_PATH}")
@@ -43,7 +43,7 @@ find_library(LibArchive_LIBRARY
         HINTS ${libarchive_PKGCONF_LIBDIR}
         PATH_SUFFIXES lib
         )
-if (LibArchive_LIBRARY)
+if(LibArchive_LIBRARY)
     # NOTE: This must be set for find_package_handle_standard_args to work
     set(LibArchive_FOUND ON)
 endif()
@@ -57,8 +57,16 @@ if(LibArchive_USE_STATIC_LIBS)
     unset(libarchive_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
 endif()
 
+if(APPLE)
+    set(libarchive_DYNAMIC_LIBS "${libarchive_PKGCONF_STATIC_LIBRARIES}")
+endif()
+
 FindDynamicLibraryDependencies(libarchive "${libarchive_DYNAMIC_LIBS}")
 
+message(STATUS "libarchive_PKGCONF_STATIC_LIBRARIES = ${libarchive_PKGCONF_STATIC_LIBRARIES}")
+message(STATUS "libarchive_DYNAMIC_LIBS = ${libarchive_DYNAMIC_LIBS}")
+message(STATUS "libarchive_LIBRARY_DEPENDENCIES = ${libarchive_LIBRARY_DEPENDENCIES}")
+
 # Set version
 set(LibArchive_VERSION ${libarchive_PKGCONF_VERSION})
 
@@ -68,8 +76,6 @@ find_package_handle_standard_args(LibArchive
         VERSION_VAR LibArchive_VERSION
         )
 
-message(STATUS "libarchive_PKGCONF_STATIC_LIBRARIES = ${libarchive_PKGCONF_STATIC_LIBRARIES}")
-message(STATUS "libarchive_LIBRARY_DEPENDENCIES = ${libarchive_LIBRARY_DEPENDENCIES}")
 if(NOT TARGET LibArchive::LibArchive)
     # Add library to build
     if (LibArchive_FOUND)
@@ -107,3 +113,4 @@ if(NOT TARGET LibArchive::LibArchive)
         endif()
     endif()
 endif()
+

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

@@ -174,17 +174,17 @@ if(CLP_BUILD_EXECUTABLES)
         )
         target_link_libraries(clp
                 PRIVATE
-                ${sqlite_LIBRARY_DEPENDENCIES}
-                ${STD_FS_LIBS}
                 Boost::filesystem Boost::program_options
-                clp::string_utils
                 date::date
                 fmt::fmt
-                LibArchive::LibArchive
                 log_surgeon::log_surgeon
+                spdlog::spdlog
+                ${sqlite_LIBRARY_DEPENDENCIES}
+                LibArchive::LibArchive
                 MariaDBClient::MariaDBClient
                 nlohmann_json::nlohmann_json
-                spdlog::spdlog
+                ${STD_FS_LIBS}
+                clp::string_utils
                 yaml-cpp
                 ystdlib::containers
                 ystdlib::error_handling

components/core/src/glt/glt/CMakeLists.txt

@@ -180,16 +180,16 @@ if(CLP_BUILD_EXECUTABLES)
         )
         target_link_libraries(glt
                 PRIVATE
-                ${sqlite_LIBRARY_DEPENDENCIES}
-                ${STD_FS_LIBS}
                 Boost::filesystem Boost::iostreams Boost::program_options
-                clp::string_utils
                 date::date
                 fmt::fmt
+                spdlog::spdlog
+                ${sqlite_LIBRARY_DEPENDENCIES}
                 LibArchive::LibArchive
                 MariaDBClient::MariaDBClient
                 nlohmann_json::nlohmann_json
-                spdlog::spdlog
+                ${STD_FS_LIBS}
+                clp::string_utils
                 yaml-cpp
                 ystdlib::error_handling
                 ZStd::ZStd