Skip to content

Commit ebd8ae4

Browse files
committed
Merge branch 'h5copy_vol_testing_fetchcontent' into HEAD
2 parents a069f54 + a97d382 commit ebd8ae4

File tree

4 files changed

+554
-370
lines changed

4 files changed

+554
-370
lines changed

.github/workflows/vol_cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,4 @@ jobs:
161161
# that this should be re-enabled in the future.
162162
if: ${{ ! matrix.async }}
163163
run: |
164-
ctest --build-config ${{ inputs.build_mode }} -VV -R "HDF5_VOL_vol-cache" .
164+
ctest --build-config ${{ inputs.build_mode }} -VV -R "HDF5_VOL_vol-cache" .

.github/workflows/vol_rest.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,5 @@ jobs:
191191
HSDS_ENDPOINT=http+unix://%2Ftmp%2Fhs%2Fsn_1.sock \
192192
ROOT_DIR=${{github.workspace}}/hsdsdata \
193193
BUCKET_NAME=hsdstest \
194-
ctest --build-config ${{ inputs.build_mode }} -VV -R "h5_api" .
194+
ctest --build-config ${{ inputs.build_mode }} -VV -R "h5_api" -E "H5COPY" .
195+

config/HDF5Macros.cmake

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,30 @@ macro (H5_CREATE_VFD_DIR)
118118
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}")
119119
endforeach ()
120120
endmacro ()
121+
122+
# Given the name of a CMake target for an external VOL connector,
123+
# populate variables with the names vol_name_out and vol_env_out with
124+
# the connector's name and the environment string needed to load the connector,
125+
# respectively.
126+
macro(HDF5_GET_VOL_TGT_INFO vol_tgt vol_name_out vol_env_out)
127+
set(${vol_env_out} "")
128+
# HDF5_VOL_CONNECTOR
129+
get_target_property (ext_vol_name "${vol_tgt}" HDF5_VOL_NAME)
130+
list(APPEND ${vol_env_out} "HDF5_VOL_CONNECTOR=${ext_vol_name}")
131+
132+
# HDF5_PLUGIN_PATH
133+
get_target_property(vol_lib_targets "${vol_tgt}" HDF5_VOL_TARGETS)
134+
set(vol_plugin_paths "${CMAKE_BINARY_DIR}/${HDF5_INSTALL_BIN_DIR}")
135+
foreach (lib_target ${vol_lib_targets})
136+
get_target_property (lib_target_output_dir "${lib_target}" LIBRARY_OUTPUT_DIRECTORY)
137+
if (NOT "${lib_target_output_dir}" STREQUAL "lib_target_output_dir-NOTFOUND"
138+
AND NOT "${lib_target_output_dir}" STREQUAL ""
139+
AND NOT "${lib_target_output_dir}" STREQUAL "${CMAKE_BINARY_DIR}/${HDF5_INSTALL_BIN_DIR}")
140+
set (vol_plugin_paths "${vol_plugin_paths}${CMAKE_SEP}${lib_target_output_dir}")
141+
endif ()
142+
endforeach ()
143+
list(APPEND ${vol_env_out} "HDF5_PLUGIN_PATH=${vol_plugin_paths}")
144+
145+
# VOL name
146+
string(REPLACE "HDF5_VOL_" "" ${vol_name_out} "${vol_tgt}")
147+
endmacro()

0 commit comments

Comments
 (0)