mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-27 08:49:16 +08:00
d538cf38c2
The primary fix is to improve CMake build support. Specific changes include: * CMake: Provide a better soln to locating the AWS SDK libraries; the new way is the preferred method as described in the aws-cpp-sdk documentation. * CMake (and Automake): allow -DENABLE_S3_SDK (default off) to suppress looking for AWS libraries. * CMake: add the complete set of nczarr tests * CMake: add EXTERNL as needed to various .h files. * Improve support for windows drive letters in paths. * Add nczarr and s3 flags to nc-config * For VisualStudio X nczarr, cleanup the NAN+INFINITY handling * Convert _MSC_VER -> _WIN32 and vice versa as needed * NCZarr - support multiple platform paths including windows, cygwin. mingw, etc. * NCZarr - sort the test outputs because different platforms produce directory contents in different orders. One big change concerns netcdf-c/CMakeLists.txt and netcdf-c/configure.ac. In the current versions, it was the case that --disable-hdf5 disabled netcdf-4 (libsrc4). With nczarr, this can no longer be the case because nczarr requires libsrc4 even if libhdf5 is disabled. So, I modified the above files to move the format options (HDF5, NCZarr, HDF4, etc) to a single place near the front of the files. Now it is the case that: * Enabling any of the formats that require libsrc4 also does an implicit --enable-netcdf4. * --disable-netcdf4 | --disable-netcdf-4 now becomes and alias for --disable-hdf5. There are probably some bugs in this change in terms of dependencies between format options. Problems: * CMake S3 support is still not working for Visual Studio * A recent issue points out that there is work to do on handling UTF8 filenames, but that will be addressed in a separate fix. Notes: * Consider converting all of our includes/.h files to use EXTERNL
69 lines
1.1 KiB
CMake
69 lines
1.1 KiB
CMake
## This is a CMake file, part of Unidata's netCDF package.
|
|
# Copyright 2018, see the COPYRIGHT file for more information.
|
|
#
|
|
# This builds the libzarr dispatch layer.
|
|
#
|
|
# Dennis Heimbigner
|
|
|
|
#add_compile_options("/showincludes")
|
|
|
|
# The source files for the HDF5 dispatch layer.
|
|
SET(libnczarr_SOURCES
|
|
zarr.c
|
|
zattr.c
|
|
zcache.c
|
|
zchunking.c
|
|
zclose.c
|
|
zcreate.c
|
|
zcvt.c
|
|
zdim.c
|
|
zdispatch.c
|
|
zfile.c
|
|
zfilter.c
|
|
zgrp.c
|
|
zinternal.c
|
|
zjson.c
|
|
zmap.c
|
|
zmap_nz4.c
|
|
zmap_nzf.c
|
|
zodom.c
|
|
zopen.c
|
|
zprov.c
|
|
zsync.c
|
|
ztype.c
|
|
zutil.c
|
|
zvar.c
|
|
zwalk.c
|
|
zdebug.c
|
|
zarr.h
|
|
zcache.h
|
|
zchunking.h
|
|
zdispatch.h
|
|
zincludes.h
|
|
zinternal.h
|
|
zjson.h
|
|
zmap.h
|
|
zodom.h
|
|
zprovenance.h
|
|
zdebug.h
|
|
)
|
|
|
|
IF(ENABLE_S3_SDK)
|
|
SET(libnczarr_SOURCES ${libnczarr_SOURCES} zs3sdk.cpp zmap_s3sdk.c awsincludes.h zs3sdk.h)
|
|
ENDIF()
|
|
|
|
# Build the Zarr dispatch layer as a library that will be included in
|
|
# the netCDF library.
|
|
add_library(nczarr OBJECT ${libnczarr_SOURCES})
|
|
|
|
IF(ENABLE_S3_SDK)
|
|
IF(NOT MSVC)
|
|
target_compile_features(nczarr PUBLIC cxx_std_11)
|
|
ENDIF()
|
|
target_include_directories(nczarr PRIVATE ${AWSSDK_INCLUDE_DIR})
|
|
ENDIF()
|
|
|
|
# Remember to package this file for CMake builds.
|
|
ADD_EXTRA_DIST(${libnczarr_SOURCES} CMakeLists.txt)
|
|
|