ckp

DennisHeimbigner · Apr 13, 2024 · 2a8b6a7 · 2a8b6a7
1 parent 07fb37d
commit 2a8b6a7
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 73 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -436,7 +436,7 @@ endif()
 # Here we disable them completely.
 option(NETCDF_ENABLE_NETCDF_4 "Use HDF5." OFF)
 option(NETCDF_ENABLE_NETCDF4 "Use HDF5." OFF)
-if(NETCDF_ENABLE_HDF5 OR NETCDF_ENABLE_NETCDF_4)
+if(NETCDF_ENABLE_NETCDF4 OR NETCDF_ENABLE_NETCDF_4)
   message(FATAL_ERROR "NETCDF_ENABLE_NETCDF4/NETCDF_ENABLE_NETCDF_4 are obsolete. Please use NETCDF_ENABLE_HDF5 instead.")
 endif()
 
@@ -1476,6 +1476,9 @@ if(NETCDF_ENABLE_TESTS)
   if(NETCDF_ENABLE_NCZARR)
     include_directories(nczarr_test)
     add_subdirectory(nczarr_test)
+    if(NETCDF_ENABLE_S3)
+      add_subdirectory(v3_nczarr_test)
+    endif()
   endif()
 endif()
 

diff --git a/cmake/netcdf_functions_macros.cmake b/cmake/netcdf_functions_macros.cmake
@@ -356,3 +356,16 @@ function(is_disabled feature ret_val)
     set("NC_${ret_val}" 1 PARENT_SCOPE)
   endif(${feature})
 endfunction()
+
+
+##################################################
+# Wrap existing macros to prepend v3_ in order to avoid
+# "...another target with the same name already exists" errors.
+
+macro(v3_build_bin_test_with_util_lib F UTIL_LIB)
+  build_bin_test_with_util_lib("v3_${F}" "v3_${UTIL_LIB}")
+endmacro()
+
+macro(v3_add_bin_test_with_util_lib PREFIX F UTIL_LIB)
+  add_bin_test_with_util_lib(${PREFIX} "v3_${F}" "v3_${UTIL_LIB}")
+endmacro()
diff --git a/nczarr_test/CMakeLists.txt b/nczarr_test/CMakeLists.txt
@@ -130,9 +130,6 @@ IF(NETCDF_ENABLE_TESTS)
   build_bin_test_with_util_lib(zmapio ut_util)
   if(USE_HDF5)
     build_bin_test_with_util_lib(ncdumpchunks ut_util)
-    target_include_directories(ncdumpchunks PUBLIC ../libnczarr)
-    target_include_directories(ncdumpchunks PUBLIC HDF5::HDF5)
-    target_link_libraries(ncdumpchunks netcdf HDF5::HDF5 hdf5::hdf5_hl)
   endif()
 
   IF(NETCDF_ENABLE_S3 AND NOT WITH_S3_TESTING STREQUAL "NO")

diff --git a/nczarr_test/ncdumpchunks.c b/nczarr_test/ncdumpchunks.c
@@ -23,7 +23,7 @@
 #include "ncpathmgr.h"
 #include "nclog.h"
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #include <H5DSpublic.h>
 #endif

diff --git a/nczarr_test/test_filter_vlen.c b/nczarr_test/test_filter_vlen.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif
 #include "netcdf.h"

diff --git a/v3_nczarr_test/CMakeLists.txt b/v3_nczarr_test/CMakeLists.txt
diff --git a/v3_nczarr_test/test_chunkcases.c b/v3_nczarr_test/test_chunkcases.c
@@ -8,7 +8,7 @@
 #include "ncpathmgr.h"
 #include "nclist.h"
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #include <H5DSpublic.h>
 #endif

diff --git a/v3_nczarr_test/test_unlim_io.c b/v3_nczarr_test/test_unlim_io.c
@@ -9,7 +9,7 @@
 #include "ncpathmgr.h"
 #include "nclist.h"
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #include <H5DSpublic.h>
 #endif

diff --git a/v3_nczarr_test/test_utils.c b/v3_nczarr_test/test_utils.c
@@ -18,7 +18,7 @@
 #include "XGetopt.h"
 #endif
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #include <H5DSpublic.h>
 #endif

diff --git a/v3_nczarr_test/testfilter.c b/v3_nczarr_test/testfilter.c
@@ -43,7 +43,7 @@ netcdf bzip2 {
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif
 

diff --git a/v3_nczarr_test/testfilter_misc.c b/v3_nczarr_test/testfilter_misc.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif
 

diff --git a/v3_nczarr_test/testfilter_multi.c b/v3_nczarr_test/testfilter_multi.c
@@ -12,7 +12,7 @@ Test support for multiple filters per variable
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif