Updated for hdf5 1.12

i-RIC · Jun 24, 2024 · 944d165 · 944d165
1 parent 3890947
commit 944d165
Show file tree

Hide file tree

Showing 4 changed files with 2,121 additions and 1 deletion.
diff --git a/netcdf-c.cmake b/netcdf-c.cmake
@@ -4,6 +4,7 @@ set(CTEST_SITE "$ENV{COMPUTERNAME}")
 
 set(VER "$ENV{NETCDF_VER}")
 set(HDF5_VER "$ENV{HDF5_VER}")
+set(ZLIB_VER "$ENV{ZLIB_VER}")
 set(CTEST_SOURCE_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}/lib/src/netcdf-c-${VER}")
 set(CTEST_BINARY_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}/lib/build/netcdf-c-${VER}/${CONF_DIR}")
 
@@ -20,6 +21,11 @@ if (WIN32)
 #     set(HDF5_LIB    "${CTEST_SCRIPT_DIRECTORY}/lib/install/hdf5-${HDF5_VER}/${CONF_DIR}/lib/hdf5.lib")
 #     set(HDF5_HL_LIB "${CTEST_SCRIPT_DIRECTORY}/lib/install/hdf5-${HDF5_VER}/${CONF_DIR}/lib/hdf5_hl.lib")
 #   endif()
+  if("${CONF_DIR}" STREQUAL "debug")
+    set(ZLIB_LIB    "${CTEST_SCRIPT_DIRECTORY}/lib/install/zlib-${ZLIB_VER}/lib/zlibd.lib")
+  else()
+    set(ZLIB_LIB    "${CTEST_SCRIPT_DIRECTORY}/lib/install/zlib-${ZLIB_VER}/lib/zlib.lib")
+  endif()
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
   if("${CONF_DIR}" STREQUAL "debug")
     set(ZLIB_LIB    "${CTEST_SCRIPT_DIRECTORY}/lib/install/hdf5-${HDF5_VER}/${CONF_DIR}/lib/libz_debug.so.1.2")
@@ -60,6 +66,7 @@ set(BUILD_OPTIONS
   -DCMAKE_INSTALL_PREFIX:PATH=${CTEST_SCRIPT_DIRECTORY}/lib/install/netcdf-c-${VER}/${CONF_DIR}
   -DENABLE_DAP:BOOL=OFF
   -DENABLE_TESTS:BOOL=OFF
+  -DENABLE_BYTERANGE:BOOL=OFF
 ##  -DHDF5_LIB:PATH=${HDF5_LIB}
 ##  -DHDF5_HL_LIB:PATH=${HDF5_HL_LIB}
 ##  -DHDF5_INCLUDE_DIR:PATH=${HDF5_INCLUDE_DIR}
@@ -71,6 +78,8 @@ set(BUILD_OPTIONS
 ##  -DMSVC12_REDIST_DIR:PATH=C:/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 12.0/VC/redist
 ##  -DCMAKE_LIBRARY_PATH:PATH=${CTEST_SCRIPT_DIRECTORY}/lib/install/hdf5-${HDF5_VER}/${CONF_DIR}/lib
   -DHDF5_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}/lib/install/hdf5-${HDF5_VER}/share/cmake/hdf5
+  -DZLIB_LIBRARY:PATH=${ZLIB_LIB}
+  -DZLIB_INCLUDE_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}/lib/install/zlib-${ZLIB_VER}/include
 )
 
 CTEST_START("Experimental")

diff --git a/netcdf-c.targets b/netcdf-c.targets
@@ -40,6 +40,9 @@
 
   <Target Name="netcdf-c-src" DependsOnTargets="netcdf-c-download" Condition="!Exists('$(SRC_DIR)\netcdf-c-$(NETCDF_VER)')">
     <Exec Command="7z x $(DOWNLOADS_DIR)\netcdf-c-$(NETCDF_VER).zip -o$(SRC_DIR)" />
+    <!-- Move netCDF_BINARY_DIR to top of include directories when '$(NETCDF_VER)' == '4.7.4'-->
+    <Move SourceFiles="$(SRC_DIR)\netcdf-c-$(NETCDF_VER)\CMakeLists.txt" DestinationFiles="$(SRC_DIR)\netcdf-c-$(NETCDF_VER)\CMakeLists.txt.orig" Condition="'$(NETCDF_VER)' == '4.7.4'" />
+    <Copy SourceFiles="patches\netcdf-c-$(NETCDF_VER)\CMakeLists.txt" DestinationFiles="$(SRC_DIR)\netcdf-c-$(NETCDF_VER)\CMakeLists.txt" Condition="'$(NETCDF_VER)' == '4.7.4'" />
   </Target>
 
   <Target Name="netcdf-c-download" Condition="!Exists('$(DOWNLOADS_DIR)\netcdf-c-$(NETCDF_VER).zip')">