From 1bd942a7eee56e572a3853dca24aaf1624422a22 Mon Sep 17 00:00:00 2001 From: BrianMichell Date: Thu, 8 Aug 2024 13:34:59 +0000 Subject: [PATCH 1/3] Moved internal cloud deps variables inside scope guard --- CMakeLists.txt | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c52ee8..1879bda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,18 +107,19 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) tensorstore::driver_array PARENT_SCOPE ) + + # Define internal deps for cloud specific drivers + set(mdio_INTERNAL_GCS_DRIVER_DEPS + tensorstore::kvstore_gcs + PARENT_SCOPE + ) + + set(mdio_INTERNAL_S3_DRIVER_DEPS + tensorstore::kvstore_s3 + PARENT_SCOPE + ) endif() -# Define internal deps for cloud specific drivers -set(mdio_INTERNAL_GCS_DRIVER_DEPS - tensorstore::kvstore_gcs - PARENT_SCOPE -) - -set(mdio_INTERNAL_S3_DRIVER_DEPS - tensorstore::kvstore_s3 - PARENT_SCOPE -) list(APPEND mdio_COMMON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) From 4024fea483fe3e8df9cd73a06c3246579980ff98 Mon Sep 17 00:00:00 2001 From: BrianMichell Date: Thu, 8 Aug 2024 13:35:35 +0000 Subject: [PATCH 2/3] Cleaned duplicate deps from lists --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1879bda..ce68498 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,11 +103,9 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) tensorstore::index_space_dim_expression tensorstore::index_space_index_transform tensorstore::util_status_testutil - tensorstore::kvstore_gcs - tensorstore::driver_array PARENT_SCOPE ) - + # Define internal deps for cloud specific drivers set(mdio_INTERNAL_GCS_DRIVER_DEPS tensorstore::kvstore_gcs From e0abcf625d25d24f8a5fc1f50dcee355a76d5d48 Mon Sep 17 00:00:00 2001 From: BrianMichell Date: Thu, 8 Aug 2024 13:42:42 +0000 Subject: [PATCH 3/3] Remove memory driver from linking --- CMakeLists.txt | 1 - mdio/CMakeLists.txt | 9 --------- 2 files changed, 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ce68498..74704a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,6 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) tensorstore::driver_zarr tensorstore::driver_json tensorstore::kvstore_file - tensorstore::kvstore_memory tensorstore::tensorstore tensorstore::index_space_dim_expression tensorstore::index_space_index_transform diff --git a/mdio/CMakeLists.txt b/mdio/CMakeLists.txt index d205d22..fe1382e 100644 --- a/mdio/CMakeLists.txt +++ b/mdio/CMakeLists.txt @@ -100,7 +100,6 @@ mdio_cc_test( tensorstore::driver_zarr tensorstore::driver_json tensorstore::kvstore_file - tensorstore::kvstore_memory tensorstore::tensorstore tensorstore::index_space_dim_expression tensorstore::index_space_index_transform @@ -124,7 +123,6 @@ mdio_cc_test( tensorstore::driver_zarr tensorstore::driver_json tensorstore::kvstore_file - tensorstore::kvstore_memory tensorstore::tensorstore tensorstore::index_space_dim_expression tensorstore::index_space_index_transform @@ -148,7 +146,6 @@ mdio_cc_test( tensorstore::driver_zarr tensorstore::driver_json tensorstore::kvstore_file - tensorstore::kvstore_memory tensorstore::tensorstore tensorstore::index_space_dim_expression tensorstore::index_space_index_transform @@ -185,7 +182,6 @@ mdio_cc_test( tensorstore::driver_zarr tensorstore::driver_json tensorstore::kvstore_file - tensorstore::kvstore_memory tensorstore::tensorstore tensorstore::index_space_dim_expression tensorstore::index_space_index_transform @@ -208,7 +204,6 @@ mdio_cc_test( tensorstore::driver_zarr tensorstore::driver_json tensorstore::kvstore_file - tensorstore::kvstore_memory tensorstore::tensorstore tensorstore::index_space_dim_expression tensorstore::index_space_index_transform @@ -231,7 +226,6 @@ mdio_cc_test( tensorstore::driver_zarr tensorstore::driver_json tensorstore::kvstore_file - tensorstore::kvstore_memory tensorstore::tensorstore tensorstore::index_space_dim_expression tensorstore::index_space_index_transform @@ -254,7 +248,6 @@ mdio_cc_test( tensorstore::driver_zarr tensorstore::driver_json tensorstore::kvstore_file - tensorstore::kvstore_memory tensorstore::tensorstore tensorstore::index_space_dim_expression tensorstore::index_space_index_transform @@ -276,7 +269,6 @@ mdio_cc_test( tensorstore::driver_zarr tensorstore::driver_json tensorstore::kvstore_file - tensorstore::kvstore_memory tensorstore::tensorstore tensorstore::index_space_dim_expression tensorstore::index_space_index_transform @@ -300,7 +292,6 @@ mdio_cc_test( tensorstore::driver_zarr tensorstore::driver_json tensorstore::kvstore_file - tensorstore::kvstore_memory tensorstore::tensorstore tensorstore::index_space_dim_expression tensorstore::index_space_index_transform