Fix fetching lz4

Author: Hind-M

.github/workflows/windows.yml

@@ -72,7 +72,6 @@ jobs:
 
       - name: Configure using cmake
         run: |
-          #choco install pkgconfiglite
           cmake -S ./ -B ./build \
           -DSPARROW_IPC_BUILD_SHARED=${{ matrix.build_shared }} \
           -DSPARROW_IPC_BUILD_TESTS=ON \

CMakeLists.txt

@@ -245,9 +245,6 @@ target_link_libraries(sparrow-ipc
         lz4::lz4
         )
 
-# target_include_directories(sparrow-ipc PRIVATE ${LZ4_INCLUDE_DIRS})
-# target_link_libraries(sparrow-ipc PRIVATE ${LZ4_LIBRARIES})
-
 # Ensure generated headers are available when building sparrow-ipc
 add_dependencies(sparrow-ipc generate_flatbuffers_headers)
 

cmake/external_dependencies.cmake

@@ -11,8 +11,8 @@ endif()
 
 function(find_package_or_fetch)
     set(options)
-    set(oneValueArgs CONAN_PKG_NAME PACKAGE_NAME GIT_REPOSITORY TAG)
-    set(multiValueArgs)
+    set(oneValueArgs CONAN_PKG_NAME PACKAGE_NAME GIT_REPOSITORY TAG SOURCE_SUBDIR)
+    set(multiValueArgs CMAKE_ARGS)
     cmake_parse_arguments(PARSE_ARGV 0 arg
         "${options}" "${oneValueArgs}" "${multiValueArgs}"
     )
@@ -29,18 +29,26 @@ function(find_package_or_fetch)
     if(FETCH_DEPENDENCIES_WITH_CMAKE STREQUAL "ON" OR FETCH_DEPENDENCIES_WITH_CMAKE STREQUAL "MISSING")
         if(NOT ${actual_pkg_name}_FOUND)
             message(STATUS "📦 Fetching ${arg_PACKAGE_NAME}")
-            FetchContent_Declare(
+            # Apply CMAKE_ARGS before fetching
+            foreach(cmake_arg ${arg_CMAKE_ARGS})
+                string(REGEX MATCH "^([^=]+)=(.*)$" _ ${cmake_arg})
+                if(CMAKE_MATCH_1)
+                    set(${CMAKE_MATCH_1} ${CMAKE_MATCH_2} CACHE BOOL "" FORCE)
+                endif()
+            endforeach()
+            set(fetch_args
                 ${arg_PACKAGE_NAME}
                 GIT_SHALLOW TRUE
                 GIT_REPOSITORY ${arg_GIT_REPOSITORY}
                 GIT_TAG ${arg_TAG}
                 GIT_PROGRESS TRUE
                 SYSTEM
                 EXCLUDE_FROM_ALL)
+            if(arg_SOURCE_SUBDIR)
+                list(APPEND fetch_args SOURCE_SUBDIR ${arg_SOURCE_SUBDIR})
+            endif()
+            FetchContent_Declare(${fetch_args})
             FetchContent_MakeAvailable(${arg_PACKAGE_NAME})
-#             get_property(all_targets GLOBAL PROPERTY TARGETS)
-            get_property(all_targets TARGET ${arg_PACKAGE_NAME} PROPERTY ALL_TARGETS)
-            message(STATUS "Available targets after ${arg_PACKAGE_NAME} build: ${all_targets}")
             message(STATUS "\t✅ Fetched ${arg_PACKAGE_NAME}")
         else()
             message(STATUS "📦 ${actual_pkg_name} found here: ${${actual_pkg_name}_DIR}")
@@ -82,29 +90,23 @@ if(NOT TARGET flatbuffers::flatbuffers)
 endif()
 unset(FLATBUFFERS_BUILD_TESTS CACHE)
 
+# Fetching lz4
+# Disable bundled mode to allow shared libraries if needed
+# lz4 is built as static by default if bundled
+# set(LZ4_BUNDLED_MODE OFF CACHE BOOL "" FORCE)
+# set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
 find_package_or_fetch(
     PACKAGE_NAME lz4
     GIT_REPOSITORY https://github.com/lz4/lz4.git
     TAG v1.10.0
+    SOURCE_SUBDIR build/cmake
+    CMAKE_ARGS
+        "LZ4_BUILD_CLI=OFF"
+        "LZ4_BUILD_LEGACY_LZ4C=OFF"
 )
 
 if(NOT TARGET lz4::lz4)
-    if(TARGET LZ4::lz4)
-        message(STATUS "📦 Found LZ4::lz4")
-        add_library(lz4::lz4 ALIAS LZ4::lz4)
-    elseif(TARGET LZ4::LZ4)
-        message(STATUS "📦 Found LZ4::LZ4")
-        add_library(lz4::lz4 ALIAS LZ4::LZ4)
-    elseif(TARGET lz4_static)
-        message(STATUS "📦 Found lz4_static")
-        add_library(lz4::lz4 ALIAS lz4_static)
-    elseif(TARGET lz4_shared)
-        message(STATUS "📦 Found lz4_shared")
-        add_library(lz4::lz4 ALIAS lz4_shared)
-    else()
-        message(STATUS "📦 NOTHING Found")
-        add_library(lz4::lz4 ALIAS lz4)
-    endif()
+    add_library(lz4::lz4 ALIAS lz4)
 endif()
 
 if(SPARROW_IPC_BUILD_TESTS)