mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +08:00
4c92fc3405
Partially address: https://github.com/Unidata/netcdf-c/issues/1056 Currently, some of the entries in the dispatch table are conditional'd on USE_NETCDF4. As a step in upgrading the dispatch table for use with user-defined tables, we remove that conditional. This means that all dispatch tables must implement the netcdf-4 specific functions even if only to make them return NC_ENOTNC4. To simplify this, a set of default functions are defined in libdispatch/dnotnc4.c to provide this behavior. The file libdispatch/dnotnc3.c is also relevant to this. The primary fix is to modify the various dispatch tables to remove the conditional and use the functions in libdispatch/dnotnc4.c as appropriate. In practice, all of the existing tables are prepared to handle this, so the only real change is to remove the conditionals. Misc. Unrelated fixes 1. Fix some annoying warnings in ncvalidator. Notes: 1. This has not been tested with either pnetcdf or hdf4 enabled. When those are enabled, it is possible that there are still some conditionals that need to be fixed.
25 lines
1.3 KiB
CMake
25 lines
1.3 KiB
CMake
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
|
|
# 2015, 2016, 2017, 2018
|
|
# University Corporation for Atmospheric Research/Unidata.
|
|
|
|
# See netcdf-c/COPYRIGHT file for more info.
|
|
SET(libdispatch_SOURCES dparallel.c dcopy.c dfile.c ddim.c datt.c dattinq.c dattput.c dattget.c derror.c dvar.c dvarget.c dvarput.c dvarinq.c ddispatch.c nclog.c dstring.c dutf8.c dinternal.c doffsets.c ncuri.c nclist.c ncbytes.c nchashmap.c nctime.c nc.c nclistmgr.c utf8proc.h utf8proc.c dwinpath.c dutil.c drc.c dauth.c dreadonly.c dnotnc4.c dnotnc3.c crc32.c daux.c dinfermodel.c)
|
|
|
|
# Netcdf-4 only functions. Must be defined even if not used
|
|
SET(libdispatch_SOURCES ${libdispatch_SOURCES} dgroup.c dvlen.c dcompound.c dtype.c denum.c dopaque.c dfilter.c)
|
|
|
|
IF(BUILD_V2)
|
|
SET(libdispatch_SOURCES ${libdispatch_SOURCES} dv2i.c)
|
|
ENDIF(BUILD_V2)
|
|
|
|
IF(ENABLE_BYTERANGE)
|
|
SET(libdispatch_SOURCES ${libdispatch_SOURCES} dhttp.c)
|
|
ENDIF(ENABLE_BYTERANGE)
|
|
|
|
add_library(dispatch OBJECT ${libdispatch_SOURCES})
|
|
|
|
FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
|
|
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
|
|
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
|