Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to CMake #82

Merged
merged 3 commits into from
Aug 14, 2024
Merged

Fixes to CMake #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bd942a
Moved internal cloud deps variables inside scope guard
BrianMichell Aug 8, 2024
4024fea
Cleaned duplicate deps from lists
BrianMichell Aug 8, 2024
e0abcf6
Remove memory driver from linking
BrianMichell Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,27 +98,25 @@ 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
tensorstore::util_status_testutil
PARENT_SCOPE
)

# Define internal deps for cloud specific drivers
set(mdio_INTERNAL_GCS_DRIVER_DEPS
tensorstore::kvstore_gcs
tensorstore::driver_array
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})

Expand Down
9 changes: 0 additions & 9 deletions mdio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down