Get the driver building again.

acquire-project · Sep 3, 2024 · c7a4827 · c7a4827
1 parent 04576eb
commit c7a4827
Show file tree

Hide file tree

Showing 13 changed files with 1,175 additions and 1,601 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -62,61 +62,35 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
 
 ####### Acquire Zarr Driver #######
 
-#if (NOT TARGET acquire-core-logger)
-#    add_subdirectory(../acquire-common/acquire-core-libs ${CMAKE_CURRENT_BINARY_DIR}/acquire-core-libs)
-#endif ()
-#
-#set(tgt-driver acquire-driver-zarr)
-#add_library(${tgt-driver} MODULE
-#        common/dimension.hh
-#        common/dimension.cpp
-#        common/thread.pool.hh
-#        common/thread.pool.cpp
-#        common/s3.connection.hh
-#        common/s3.connection.cpp
-#        common/utilities.hh
-#        common/utilities.cpp
-#        writers/sink.hh
-#        writers/sink.creator.hh
-#        writers/sink.creator.cpp
-#        writers/file.sink.hh
-#        writers/file.sink.cpp
-#        writers/s3.sink.hh
-#        writers/s3.sink.cpp
-#        writers/array.writer.hh
-#        writers/array.writer.cpp
-#        writers/zarrv2.array.writer.hh
-#        writers/zarrv2.array.writer.cpp
-#        writers/zarrv3.array.writer.hh
-#        writers/zarrv3.array.writer.cpp
-#        writers/blosc.compressor.hh
-#        writers/blosc.compressor.cpp
-#        zarr.hh
-#        zarr.cpp
-#        zarr.v2.hh
-#        zarr.v2.cpp
-#        zarr.v3.hh
-#        zarr.v3.cpp
-#        zarr.driver.c
-#)
-#
-#target_include_directories(${tgt-driver} PRIVATE
-#        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>
-#)
-#
-#target_enable_simd(${tgt-driver})
-#target_link_libraries(${tgt-driver} PRIVATE
-#        acquire-core-logger
-#        acquire-core-platform
-#        acquire-device-kit
-#        acquire-device-properties
-#        blosc_static
-#        nlohmann_json::nlohmann_json
-#        miniocpp::miniocpp
-#)
-#
-#set_target_properties(${tgt-driver} PROPERTIES
-#        MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
-#)
-#
-#install(TARGETS ${tgt-driver} LIBRARY DESTINATION lib)
+if (NOT TARGET acquire-core-logger)
+    add_subdirectory(${CMAKE_SOURCE_DIR}/acquire-common/acquire-core-libs ${CMAKE_CURRENT_BINARY_DIR}/acquire-core-libs)
+endif ()
+
+set(tgt-driver acquire-driver-zarr)
+add_library(${tgt-driver} MODULE
+        driver/zarr.storage.hh
+        driver/zarr.storage.cpp
+        driver/zarr.driver.c
+)
+
+target_include_directories(${tgt-driver} PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>
+)
+
+target_enable_simd(${tgt-driver})
+target_link_libraries(${tgt-driver} PRIVATE
+        acquire-core-logger
+        acquire-core-platform
+        acquire-device-kit
+        acquire-device-properties
+        ${tgt}
+        blosc_static
+        nlohmann_json::nlohmann_json
+        miniocpp::miniocpp
+)
+
+set_target_properties(${tgt-driver} PROPERTIES
+        MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
+)
+
+install(TARGETS ${tgt-driver} LIBRARY DESTINATION lib)