wip

Author: Alex-PLACET

.github/workflows/windows.yml

@@ -39,7 +39,6 @@ jobs:
             -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^
             -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX% ^
             -DCMAKE_PREFIX_PATH=%CONDA_PREFIX% ^
-            -DCMAKE_CXX_STANDARD=20 ^
             -DSPARROW_IPC_BUILD_SHARED=${{ matrix.build_shared }} ^
             -DSPARROW_IPC_BUILD_TESTS=ON
           if %errorlevel% neq 0 exit /b %errorlevel%
@@ -50,7 +49,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        build_type: [Debug] # TODO add Release
+        build_type: [Release, Debug]
         build_shared: [ON, OFF]
     steps:
       - name: Checkout repository
@@ -60,10 +59,8 @@ jobs:
         run: |
           cmake -B build/ -G Ninja ^
             -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^
-            -DCMAKE_CXX_STANDARD=20 ^
             -DSPARROW_IPC_BUILD_SHARED=${{ matrix.build_shared }} ^
             -DFETCH_DEPENDENCIES_WITH_CMAKE=MISSING ^
-            -DCMAKE_VERBOSE_MAKEFILE=ON ^
             -DSPARROW_IPC_BUILD_TESTS=ON
           if %errorlevel% neq 0 exit /b %errorlevel%
           cmake --build build/ --parallel

CMakeLists.txt

@@ -56,12 +56,6 @@ set(SPARROW_IPC_SRC
     ${SPARROW_IPC_SOURCE_DIR}/serialize.cpp
 )
 
-# find_program(FLATC_EXECUTABLE flatc)
-
-# if(NOT FLATC_EXECUTABLE)
-#     message(FATAL_ERROR "flatc not found. Please install Flatbuffers.")
-# endif()
-
 # Fetch schemas from apache arrow
 set(SCHEMA_DIR ${CMAKE_BINARY_DIR}/format)
 set(SCHEMA_URLS
@@ -117,33 +111,35 @@ target_include_directories(flatbuffers_interface INTERFACE ${FLATBUFFERS_GENERAT
 add_dependencies(flatbuffers_interface generate_flatbuffers_headers)
 
 add_library(sparrow-ipc ${SPARROW_IPC_LIBRARY_TYPE} ${SPARROW_IPC_SRC} ${SPARROW_IPC_HEADERS})
-target_compile_definitions(sparrow-ipc PUBLIC ${SPARROW_IPC_COMPILE_DEFINITIONS})
-
-if(UNIX)
-    target_compile_options(sparrow-ipc PRIVATE "-fvisibility=hidden")
-else()
-    target_compile_definitions(sparrow-ipc PRIVATE SPARROW_IPC_EXPORTS)
-endif()
 
 target_compile_options(sparrow-ipc
     PRIVATE
         ${compile_options}
 )
 
-target_include_directories(sparrow-ipc PUBLIC ${SPARROW_IPC_INCLUDE_DIR} PRIVATE ${SPARROW_IPC_SOURCE_DIR} )
+target_compile_definitions(sparrow-ipc
+    PUBLIC
+        ${SPARROW_IPC_COMPILE_DEFINITIONS})
 
-target_link_libraries(sparrow-ipc PRIVATE flatbuffers_interface)
-target_link_libraries(sparrow-ipc PUBLIC flatbuffers::flatbuffers)
-
-# Link sparrow depending on how it was found or fetched
-if(TARGET sparrow)
-    target_link_libraries(sparrow-ipc PUBLIC sparrow)
-elseif(TARGET sparrow::sparrow)
-    target_link_libraries(sparrow-ipc PUBLIC sparrow::sparrow)
+if(UNIX)
+    target_compile_options(sparrow-ipc PRIVATE "-fvisibility=hidden")
 else()
-    message(FATAL_ERROR "Could not find the sparrow target to link with.")
+    target_compile_definitions(sparrow-ipc PRIVATE SPARROW_IPC_EXPORTS)
 endif()
 
+target_include_directories(sparrow-ipc
+    PUBLIC
+        ${SPARROW_IPC_INCLUDE_DIR}
+    PRIVATE
+        ${SPARROW_IPC_SOURCE_DIR} )
+
+target_link_libraries(sparrow-ipc 
+    PUBLIC
+        sparrow::sparrow
+        flatbuffers::flatbuffers
+    PRIVATE
+        flatbuffers_interface)
+
 add_dependencies(sparrow-ipc generate_flatbuffers_headers)
 
 if(SPARROW_IPC_BUILD_TESTS)

cmake/external_dependencies.cmake

@@ -45,6 +45,10 @@ find_package_or_fetch(
     TAG 1.0.0
 )
 
+if(NOT TARGET sparrow::sparrow)
+    add_library(sparrow::sparrow ALIAS sparrow)
+endif()
+
 set(FLATBUFFERS_BUILD_TESTS OFF)
 find_package_or_fetch(
     PACKAGE_NAME FlatBuffers