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
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
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
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
Ward Fisher
6662212460
Merge pull request #2867 from Julius-Plehn/fix/hdf5_config_header
...
Fixes finding HDF5 header
2024-02-29 17:50:21 -07:00
Ward Fisher
8633448eea
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.
2024-02-29 12:15:30 -07:00
Ward Fisher
d557272be6
Merge branch 'packaging' of github.com:K20shores/netcdf-c into packaging
2024-02-29 12:02:04 -07:00
Ward Fisher
5ee9038a9f
Update cmake-based plugins and test logic.
2024-02-29 12:01:52 -07:00
Ward Fisher
2ffbcc660b
Modify messages to be more clear.
2024-02-29 11:53:13 -07:00
Kyle Shores
c29db073eb
setting dll export on each target
2024-02-29 11:36:47 -06:00
Ward Fisher
f9b1b67d38
Correct lingering compilation issue under Visual Studio. Hopefully I haven't broken the Linux build
2024-02-28 16:45:48 -07:00
Ward Fisher
6738723b72
Addressing a handful of issues encountered in Visual Studio re: linking, setting compiler flags for VC, etc.
2024-02-28 16:29:23 -07:00
Kyle Shores
1508c678be
removing c++ header file from c header
2024-02-27 11:50:24 -06:00
Ward Fisher
182d462203
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.
2024-02-26 17:34:00 -07:00
Ward Fisher
44cb18169e
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.
2024-02-23 14:06:17 -07:00
Kyle Shores
1e31577a2c
removing unused cmake
2024-02-23 09:36:57 -06:00
Kyle Shores
5ee4424c5b
updating tests to use correct cmake variable
2024-02-23 09:25:47 -06:00
Kyle Shores
8551a2907e
removing possibly redundant cmake for shared library
2024-02-23 09:11:04 -06:00
Kyle Shores
3b0d520189
updating release notes
2024-02-23 09:04:07 -06:00
Kyle Shores
c24a0d0968
bumping cmake version
2024-02-23 09:02:15 -06:00
Kyle Shores
3526faa98d
removing debug information
2024-02-23 09:01:28 -06:00
Kyle Shores
a73f4960e3
fixing a typo
2024-02-22 16:00:48 -06:00
Kyle Shores
9dbf67e88c
updating hdf version
2024-02-22 11:16:11 -06:00
Kyle Shores
4edb8f8424
changing all macos versions
2024-02-22 11:04:20 -06:00
Kyle Shores
ab56e9a10b
bumping macos version to see if the test passes
2024-02-22 10:26:38 -06:00
Kyle Shores
dda2c2de69
merging main
2024-02-22 09:59:05 -06:00
Peter Hill
7489c3d829
CI: Don't force -fPIC in static build
2024-02-22 09:50:56 -06:00
Peter Hill
7a9cafb161
CMake: Always prefer shared HDF5 libs on linux
2024-02-22 09:49:27 -06:00
Peter Hill
77ff561b13
CMake: Turn off plugins if building statically
2024-02-22 09:49:27 -06:00
Peter Hill
046846ecb4
CMake: Set BUILD_SHARED_LIBS before add_library(netcdf)
2024-02-22 09:49:27 -06:00
Julius Plehn
6cc5c17789
Fixes finding HDF5 header
2024-02-22 11:04:00 +01:00
Kyle Shores
3341fbddf4
another compile definition set on the cmake target
2024-02-21 16:42:44 -06:00
Kyle Shores
09ab86122d
undoing change to github actions, removing PIC
2024-02-21 16:27:28 -06:00
Ward Fisher
3433670f48
Merge pull request #2866 from WardF/update-actions.wif
...
Add static build to one-off GitHub Actions testing.
2024-02-21 15:13:18 -07:00
Ward Fisher
16b6344dde
Add one-off static compilation test to MacOS-based GitHub actions using cmake.
2024-02-21 14:06:08 -07:00
