Merge remote-tracking branch 'upstream/standalone-sequence-3' into st…

…andalone
acquire-project · Sep 17, 2024 · 58e1cc7 · 58e1cc7
2 parents afa9ace + a811e22
commit 58e1cc7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/include/zarr.types.h b/include/zarr.types.h
@@ -119,9 +119,9 @@ extern "C"
         size_t bytes_of_name; /**< Bytes in @p name, including null terminator */
         ZarrDimensionType kind; /**< Type of the dimension */
         uint32_t array_size_px; /**< Size of the array along this dimension in
-                                   pixels */
+                                     pixels */
         uint32_t chunk_size_px; /**< Size of the chunks along this dimension in
-                                   pixels */
+                                     pixels */
         uint32_t shard_size_chunks; /**< Number of chunks in a shard along this
                                        dimension */
     } ZarrDimensionProperties;

diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
@@ -1,4 +1,4 @@
-option(BUILD_ACQUIRE_DRIVER_ZARR ON)
+option(BUILD_ACQUIRE_DRIVER_ZARR "Build the Acquire Zarr driver" ON)
 
 if (BUILD_ACQUIRE_DRIVER_ZARR)
     if (NOT TARGET acquire-core-logger)
@@ -13,7 +13,7 @@ if (BUILD_ACQUIRE_DRIVER_ZARR)
     )
 
     target_include_directories(${tgt} PRIVATE
-            $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     )
 
     target_enable_simd(${tgt})

diff --git a/src/README.md → src/driver/README.md b/src/README.md → src/driver/README.md