diff --git a/CMakeLists.txt b/CMakeLists.txt index d6282368..1a756dd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,7 +149,7 @@ set(netcdf_c_dispatch_SOURCES dvar.c ddim.c dvarput.c dvarget.c ddispatch.c dcom dvlen.c nc.c dfile.c dnotnc4.c dstring.c nclist.c nchashmap.c dinstance_intern.c dtype.c dgroup.c nclistmgr.c dattget.c dattinq.c dvarinq.c dfilter.c derror.c doffsets.c datt.c dattput.c dcopy.c drc.c dpathmgr.c dmissing.c nclog.c dutf8.c utf8proc.c ncbytes.c dopaque.c ncuri.c dcrc64.c dinstance.c - ds3util.c dutil.c dauth.c dinfermodel.c + ds3util.c dutil.c dauth.c dinfermodel.c ncindex.c dudfplugins.c dglobal.c dplugins.c ) add_prefix(gitmodules/netcdf-c/libdispatch/ netcdf_c_dispatch_SOURCES) @@ -165,7 +165,7 @@ add_prefix(gitmodules/netcdf-c/liblib/ netcdf_c_lib_SOURCES) set(netcdf_c_src_SOURCES nc3dispatch.c nc3internal.c dim.c var.c ncio.c v1hpg.c memio.c posixio.c) add_prefix(gitmodules/netcdf-c/libsrc/ netcdf_c_src_SOURCES) -set(netcdf_c_src4_SOURCES nc4internal.c ncindex.c nc4cache.c nc4dispatch.c nc4type.c nc4grp.c nc4var.c +set(netcdf_c_src4_SOURCES nc4internal.c nc4cache.c nc4dispatch.c nc4type.c nc4grp.c nc4var.c ncfunc.c nc4dim.c nc4filters.c nc4attr.c ) add_prefix(gitmodules/netcdf-c/libsrc4/ netcdf_c_src4_SOURCES) @@ -378,15 +378,16 @@ endforeach() file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/netcdf) string(CONCAT cmd "import sys; print(''.join([line for line in sys.stdin" - " if ('VERSION' in line and line.strip().startswith('SET'))" + " if ('VERSION' in line and line.strip().upper().startswith('SET'))" " or 'CHUNK_' in line" " or '_CHUNKS_' in line" " or '_CACHE_SIZE' in line" - " or line.strip().startswith('CHECK_INCLUDE_FILE')" - " or line.strip().startswith('CHECK_TYPE_SIZE')" - " or line.strip().startswith('CHECK_FUNCTION_EXISTS')" + " or line.strip().upper().startswith('CHECK_INCLUDE_FILE')" + " or line.strip().upper().startswith('CHECK_TYPE_SIZE')" + " or line.strip().upper().startswith('CHECK_FUNCTION_EXISTS')" " or 'IF(SIZEOF_' in line" " or '_T TRUE)' in line" + " or 'PLUGIN_SEARCH_PATH' in line" "]))" ) include(CheckFunctionExists) diff --git a/gitmodules/netcdf-c b/gitmodules/netcdf-c index 7cb42a67..4c297e0c 160000 --- a/gitmodules/netcdf-c +++ b/gitmodules/netcdf-c @@ -1 +1 @@ -Subproject commit 7cb42a673903e9fd80008f9cff0cb0ca8c6f08ed +Subproject commit 4c297e0c7c4aaff75a31c528206e985f6695ee5d diff --git a/pyproject.toml b/pyproject.toml index 49ee77f3..a9a256ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -117,6 +117,10 @@ include = [ "gitmodules/netcdf-c/include/hdf5internal.h", "gitmodules/netcdf-c/include/hdf5dispatch.h", "gitmodules/netcdf-c/include/ncdimscale.h", + "gitmodules/netcdf-c/include/ncglobal.h", + "gitmodules/netcdf-c/include/ncutil.h", + "gitmodules/netcdf-c/include/ncudfplugins.h", + "gitmodules/netcdf-c/include/ncplugins.h", "gitmodules/netcdf-c/libdispatch/utf8proc_data.c", "gitmodules/netcdf-c/libdispatch/utf8proc.h", "gitmodules/netcdf-c/libdispatch/dvar.c", @@ -162,6 +166,10 @@ include = [ "gitmodules/netcdf-c/libdispatch/dutil.c", "gitmodules/netcdf-c/libdispatch/dauth.c", "gitmodules/netcdf-c/libdispatch/dinfermodel.c", + "gitmodules/netcdf-c/libdispatch/ncindex.c", + "gitmodules/netcdf-c/libdispatch/dudfplugins.c", + "gitmodules/netcdf-c/libdispatch/dglobal.c", + "gitmodules/netcdf-c/libdispatch/dplugins.c", "gitmodules/netcdf-c/liblib/nc_initialize.c", "gitmodules/netcdf-c/libsrc/ncx.h", "gitmodules/netcdf-c/libsrc/ncio.h", @@ -177,7 +185,6 @@ include = [ "gitmodules/netcdf-c/libsrc/memio.c", "gitmodules/netcdf-c/libsrc/posixio.c", "gitmodules/netcdf-c/libsrc4/nc4internal.c", - "gitmodules/netcdf-c/libsrc4/ncindex.c", "gitmodules/netcdf-c/libsrc4/nc4cache.c", "gitmodules/netcdf-c/libsrc4/nc4dispatch.c", "gitmodules/netcdf-c/libsrc4/nc4type.c",