Commit Graph

10096 Commits

Author SHA1 Message Date
Kyle Shores
2bce1e6776 Replace ENABLE_CDF5 with NETCDF_ENABLE_CDF5 2024-03-18 15:51:04 -05:00
Kyle Shores
b4eb8bf019 Replace ENABLE_BYTERANGE with NETCDF_ENABLE_BYTERANGE 2024-03-18 15:50:57 -05:00
Kyle Shores
eb489815ff Replace ENABLE_BENCHMARKS with NETCDF_ENABLE_BENCHMARKS 2024-03-18 15:50:09 -05:00
Kyle Shores
4b0611bf71 Replace ENABLE_BASH_SCRIPT_TESTING with NETCDF_ENABLE_BASH_SCRIPT_TESTING 2024-03-18 15:50:07 -05:00
Kyle Shores
e934438e14 replacing ENABLE_ATEXIT_FINALIZE 2024-03-18 15:30:20 -05:00
Kyle Shores
6d9726473b replacing DOXYGEN_ENABLE_TASKS 2024-03-18 15:29:56 -05:00
Kyle Shores
dc4830a632 replacing BUILD_UTILITIES 2024-03-18 15:29:24 -05:00
Peter Hill
d8e29bde57
Silence conversion warnings in libsrc4 2024-03-15 17:46:17 +00:00
Peter Hill
cc96826d41
Flip conditionals to avoid extraneous copying and type conversion 2024-03-15 17:29:14 +00:00
Peter Hill
7f1ccdc877
Silence conversion warnings in oc2 2024-03-15 17:29:13 +00:00
Peter Hill
c35644aa10
Fix wrong return type from function definition 2024-03-15 17:29:13 +00:00
Kyle Shores
0cf9c554d9 removing things I didn't mean to commit 2024-03-15 11:16:50 -05:00
Ward Fisher
0f7558c7d5
Merge pull request #2888 from derobins/1_10_api_fix
Fix for H5Literate() callback versioning
2024-03-14 10:22:28 -06:00
Dana Robinson
c9bbf8f626
Fix typo and clarify comment 2024-03-13 13:43:17 -07:00
Dana Robinson
586d047d97 Merge branch '1_10_api_fix' of https://github.com/derobins/netcdf-c into 1_10_api_fix 2024-03-13 13:40:57 -07:00
Dana Robinson
ae85c34661 Update tst_h_files4.c to work with HDF5 1.8
HDF5 1.8 never defined H5_USE_18_API_DEFAULT
2024-03-13 13:40:02 -07:00
Dana Robinson
32f12d1c1b
Update tst_h_files4.c 2024-03-13 08:49:00 -07:00
Dana Robinson
a2dff313f7 Fix for H5Literate() callback versioning
The netCDF library supports many versions of HDF5, which handles API
compatibility via a set of API-call-specific macros. netCDF uses
H5Literate(), which was versioned in the 1.12.x maintenance line
in order to better support the virtual object layer (VOL).

h5_test/tst_h_files4.c failed to compile with certain compilers when the
HDF5 library was built using pre-VOL versions of the library- e.g., 1.10,
which can be configured with --with-default-api-version=110. This was due
to the API compatibility macros being used to select the 1.10 version of
H5Literate(), but not its callback function, which was set using a
`H5_VERSION_GE()` macro that does not take the compatibility macros into
consideration.

Fixing the problem involved removing the `H5_VERSION_GE()` macro and
letting the compatibility macros handle the versioning, and using the
`H5_USE_XXX_API_DEFAULT` symbols to protect the H5Oopen_by_addr() call
used in the callback (a new call that wasn't versioned, hence the
different protection mechanism).

Tested w/ HDF5's develop branch w/ both 1.14 and 1.10 API bindings

Fixes #2886 (4118 in HDF5's issue tracker)
2024-03-13 08:25:59 -07:00
Ward Fisher
b90e884fe1
Merge pull request #2885 from ZedThree/fix-ci-hdf5-version
CI: Fix version of HDF5 used in one-off test
2024-03-12 16:32:41 -06:00
Ward Fisher
50a3ce0927
Merge pull request #2841 from ZedThree/find_pnetcdf
Pull out `FindPNETCDF` CMake module
2024-03-12 16:30:29 -06:00
Peter Hill
43871eb5a3
Fix warnings in unit_test 2024-03-12 16:13:41 +00:00
Peter Hill
c11e3d1686
Fix warnings in nctest 2024-03-12 16:13:41 +00:00
Peter Hill
662afedb90
Fix warnings in examples 2024-03-12 16:13:41 +00:00
Peter Hill
3e70c8133f
Fix warnings in nc_test 2024-03-12 16:13:40 +00:00
Peter Hill
e7540a33de
Fix warnings in h5_test 2024-03-12 16:13:40 +00:00
Peter Hill
b3a3389202
Fix warnings in nc_test4 2024-03-12 16:13:40 +00:00
Peter Hill
baf8108b56
CMake: Fix outdated comment for ncgen generation 2024-03-12 13:36:19 +00:00
Peter Hill
f4a909a86e
Merge branch 'main' into cmake-ncgen-generate
* main: (209 commits)
  Bump Visual Studio appveyor, for the brief period before we swap out to GitHub actions.
  Make a change in support of https://github.com/Unidata/netcdf-c/pull/2879
  Revert "fix cmake build with ENABLE_HDF4 and hdf requiring jpeg"
  removing need for global compile definition
  fix cmake build with ENABLE_HDF4 and hdf requiring jpeg
  Removed assumption that we are linking against static HDF5 when building a static library. While it's reasonable to provide a mechanism to specify this, it is not necessarily true. We should also perhaps rename the NC_FIND_SHARED option, since LIBS implies it will look for static or shared libraries for all dependencies, but this logic only looks for HDF5. In any case, commenting this out for now until we can rework it.
  Re-adding global add-definition for the time being.  Its lack introduces an unnecessary roadblock (at the moment).  Re-formulated logic for determining what tests to run when.  Need to figure out why plugins are turned off when MINGW is true, but that's a different issue.  As of this push, all tests succeed on local windows system.
  Update cmake-based plugins and test logic.
  Modify messages to be more clear.
  setting dll export on each target
  Correct lingering compilation issue under Visual Studio. Hopefully I haven't broken the Linux build
  Addressing a handful of issues encountered in Visual Studio re: linking, setting compiler flags for VC, etc.
  removing c++ header file from c header
  Corrected a dependencies issue linking against libcurl and finding curl/curl.h using Visual Studio.  There's another issue to correct, but this is getting us a lot closer.
  Correct(?) syntax with target_compile_options() in top level CMakeLists.txt.  Correct the logic flow in libncxml/CMakeLists.txt to not try to include non-existant directory when libxml2 is not found.
  removing unused cmake
  updating tests to use correct cmake variable
  removing possibly redundant cmake for shared library
  updating release notes
  bumping cmake version
  ...
2024-03-12 13:16:53 +00:00
Peter Hill
83e184bc75
Link nc_test against third-party libraries
Ensures pnetcdf include directory is in path
2024-03-12 09:59:30 +00:00
Peter Hill
77df436b0d
CI: Fix version of HDF5 used in one-off test 2024-03-12 09:47:05 +00:00
Peter Hill
e7e1d7c413
CI: Fix version of HDF5 used in one-off test 2024-03-12 09:44:28 +00:00
Ward Fisher
443195973a
Merge branch 'main' into find_pnetcdf 2024-03-11 16:02:54 -06:00
Ward Fisher
5973f3d683
Merge pull request #2847 from K20shores/packaging
Use cmake netCDF with target_* for many options
2024-03-11 15:55:36 -06:00
Peter Hill
31d1fc0a6e
Fix warning about uninitialised nciop 2024-03-11 15:55:43 +00:00
Peter Hill
09e96aeaee
Silence many conversion warnings in libsrc 2024-03-11 15:55:41 +00:00
Peter Hill
ab052f65ec
Fix default type for alloca argument 2024-03-11 15:53:31 +00:00
Ward Fisher
79cb6c554b Bump Visual Studio appveyor, for the brief period before we swap out to GitHub actions. 2024-03-08 16:38:27 -07:00
Ward Fisher
bca37ebe0e Make a change in support of https://github.com/Unidata/netcdf-c/pull/2879 2024-03-07 17:02:26 -07:00
Ward Fisher
902896eb76
Merge pull request #2882 from Unidata/revert-2879-hdf-jpeg
Revert "fix cmake build with ENABLE_HDF4 and hdf requiring jpeg"
2024-03-07 16:58:52 -07:00
Ward Fisher
54e6189dd9
Revert "fix cmake build with ENABLE_HDF4 and hdf requiring jpeg" 2024-03-07 16:58:43 -07:00
Ward Fisher
0b9d85451c
Merge pull request #2879 from aumuell/hdf-jpeg
fix cmake build with ENABLE_HDF4 and hdf requiring jpeg
2024-03-07 16:58:21 -07:00
Kyle Shores
76f5a08f23 removing need for global compile definition 2024-03-07 10:57:25 -06:00
Martin Aumüller
9277878e6f fix cmake build with ENABLE_HDF4 and hdf requiring jpeg
Currently, the build fails because jpeg libraries are not linked in.
There is already a HDF4_LIBRARIES that always includes HDF4_MFHDF_LIB and
HDF4_DF_LIB (in cmake/dependencies.cmake), but this is never used.
HDF4_LIBRARIES will also include jpeg libraries, if required.

Fix build by linking against jpeg by linking against HDF4_LIBRARIES instead
of the two more specific variables.
2024-03-06 21:52:44 +01:00
Ward Fisher
6bcfb4bf8a
Merge pull request #2819 from DennisHeimbigner/awsdfalt.dmh
Properly handle missing regions in URLS
2024-03-05 14:34:10 -07:00
Ward Fisher
cc1494d988
Merge branch 'main' into awsdfalt.dmh 2024-03-05 12:50:08 -07:00
Ward Fisher
64cb40424c Removed assumption that we are linking against static HDF5 when building a static library. While it's reasonable to provide a mechanism to specify this, it is not necessarily true. We should also perhaps rename the NC_FIND_SHARED option, since LIBS implies it will look for static or shared libraries for all dependencies, but this logic only looks for HDF5. In any case, commenting this out for now until we can rework it. 2024-03-05 09:39:35 -07:00
Peter Hill
04db10e5c1
Change NC_ATT_INFO.len to size_t
Fixes about 20 warnings
2024-03-04 17:05:03 +00:00
Sean McBride
6f5a3b7371 Added a .clang-tidy config file 2024-03-01 20:46:58 -05:00
Sean McBride
edcfc61fe6 Manually fixed performance-type-promotion-in-math-fn warnings 2024-03-01 20:46:58 -05:00
Sean McBride
e1f22bc4ed Manually fixed readability-suspicious-call-argument warnings 2024-03-01 20:46:58 -05:00