Ward Fisher
610afe8c2c
Correct typo.
2024-04-08 11:51:52 -06:00
Ward Fisher
2798948670
Remove check for libcurl unless it is necessary for required functionality.
2024-04-08 10:34:22 -06:00
Ward Fisher
cdd9cbb83c
Merging current main development branch, changing option name to include
...
NETCDF_ prefix. Thanks!
Merge remote-tracking branch 'upstream/main' into cmake-ncgen-generate
2024-03-21 14:08:12 -06:00
Ward Fisher
37e6b92703
Merge pull request #2895 from K20shores/prefix_options
...
Prefix all options with NETCDF_
2024-03-20 12:07:23 -06:00
Ward Fisher
ab2adc68da
A bit of cleanup for now, more to follow, but moving on to other roadblocks.
2024-03-20 11:25:36 -06:00
Ward Fisher
43573c5669
Comment out debugging messages, will remove before final merge. Clean up the logic, remove some rough edges.
2024-03-19 16:36:20 -06:00
Ward Fisher
67609b0965
Add a filter to process options and report deprecation warning.
2024-03-19 16:30:47 -06:00
Kyle Shores
5097e2ed9e
adding deprecation error for usage of NETCDF_ENABLE_NETCDF4
2024-03-19 11:58:03 -05:00
Kyle Shores
449c0e3f97
removing cmake alias variable for netcdf4
2024-03-19 11:54:54 -05:00
Kyle Shores
adc82f5d1d
replacing something that removes semicolons
2024-03-19 09:36:54 -05:00
Kyle Shores
9be78dc53a
Replacing NC_USE_STATIC_CRT with NETCDF_USE_STATIC_CRT
2024-03-18 15:57:34 -05:00
Kyle Shores
345e4462e3
Replace NC_FIND_SHARED_LIBS with NETCDF_FIND_SHARED_LIBS
2024-03-18 15:55:25 -05:00
Kyle Shores
d9bdb5cf86
Replace ENABLE_XGETOPT with NETCDF_ENABLE_XGETOPT
2024-03-18 15:55:04 -05:00
Kyle Shores
ff1307b62d
Replace ENABLE_UNIT_TESTS with NETCDF_ENABLE_UNIT_TESTS
2024-03-18 15:54:51 -05:00
Kyle Shores
a82659b0e9
Replace ENABLE_TESTS with NETCDF_ENABLE_TESTS
2024-03-18 15:54:48 -05:00
Kyle Shores
6c652a6495
Replace ENABLE_STRICT_NULL_BYTE_HEADER_PADDING with NETCDF_ENABLE_STRICT_NULL_BYTE_HEADER_PADDING
2024-03-18 15:54:29 -05:00
Kyle Shores
b2fabc2d7a
Replace ENABLE_STDIO with NETCDF_ENABLE_STDIO
2024-03-18 15:54:26 -05:00
Kyle Shores
eaff8289fc
Replace ENABLE_SHARED_LIBRARY_VERSION with NETCDF_ENABLE_SHARED_LIBRARY_VERSION
2024-03-18 15:54:23 -05:00
Kyle Shores
e5ee259288
Replace ENABLE_SET_LOG_LEVEL_FUNC with NETCDF_ENABLE_SET_LOG_LEVEL_FUNC
2024-03-18 15:54:20 -05:00
Kyle Shores
8fd6dcb979
Replace ENABLE_S3 with NETCDF_ENABLE_S3
2024-03-18 15:54:15 -05:00
Kyle Shores
78fb3dcf37
Replace ENABLE_REMOTE_FUNCTIONALITY with NETCDF_ENABLE_REMOTE_FUNCTIONALITY
2024-03-18 15:54:12 -05:00
Kyle Shores
85f697868c
Replace ENABLE_QUANTIZE with NETCDF_ENABLE_QUANTIZE
2024-03-18 15:54:07 -05:00
Kyle Shores
dba34ac5c2
Replace ENABLE_PNETCDF with NETCDF_ENABLE_PNETCDF
2024-03-18 15:54:02 -05:00
Kyle Shores
44778e52bf
Replace ENABLE_PLUGINS with NETCDF_ENABLE_PLUGINS
2024-03-18 15:53:59 -05:00
Kyle Shores
f54f42db62
Replace ENABLE_PARALLEL_TESTS with NETCDF_ENABLE_PARALLEL_TESTS
2024-03-18 15:53:56 -05:00
Kyle Shores
2baf0ba862
Replace ENABLE_PARALLEL4 with NETCDF_ENABLE_PARALLEL4
2024-03-18 15:53:49 -05:00
Kyle Shores
1ada3f6717
Replace ENABLE_NETCDF_4 with NETCDF_ENABLE_NETCDF_4
2024-03-18 15:53:46 -05:00
Kyle Shores
b51234b06a
Replace ENABLE_NETCDF4 with NETCDF_ENABLE_NETCDF4
2024-03-18 15:52:21 -05:00
Kyle Shores
d1334f7b88
Replace ENABLE_NCZARR with NETCDF_ENABLE_NCZARR
2024-03-18 15:52:19 -05:00
Kyle Shores
7f8ad2c250
Replace ENABLE_MMAP with NETCDF_ENABLE_MMAP
2024-03-18 15:52:17 -05:00
Kyle Shores
c6d35cf7e2
Replace ENABLE_METADATA_PERF_TESTS with NETCDF_ENABLE_METADATA_PERF_TESTS
2024-03-18 15:52:13 -05:00
Kyle Shores
dcdff98109
Replace ENABLE_LOGGING with NETCDF_ENABLE_LOGGING
2024-03-18 15:52:11 -05:00
Kyle Shores
9584b4fa3b
Replace ENABLE_LIBXML2 with NETCDF_ENABLE_LIBXML2
2024-03-18 15:52:09 -05:00
Kyle Shores
ba2cf68597
Replace ENABLE_LARGE_FILE_TESTS with NETCDF_ENABLE_LARGE_FILE_TESTS
2024-03-18 15:52:07 -05:00
Kyle Shores
57600055d0
Replace ENABLE_LARGE_FILE_SUPPORT with NETCDF_ENABLE_LARGE_FILE_SUPPORT
2024-03-18 15:52:06 -05:00
Kyle Shores
39a04033d3
Replace ENABLE_INTERNAL_DOCS with NETCDF_ENABLE_INTERNAL_DOCS
2024-03-18 15:52:04 -05:00
Kyle Shores
c5f24df396
Replace ENABLE_HDF5 with NETCDF_ENABLE_HDF5
2024-03-18 15:52:02 -05:00
Kyle Shores
376f6b8314
Replace ENABLE_HDF4 with NETCDF_ENABLE_HDF4
2024-03-18 15:52:00 -05:00
Kyle Shores
e9f700befc
Replace ENABLE_FSYNC with NETCDF_ENABLE_FSYNC
2024-03-18 15:51:59 -05:00
Kyle Shores
37ed3708c0
Replace ENABLE_FILTER_ZSTD with NETCDF_ENABLE_FILTER_ZSTD
2024-03-18 15:51:57 -05:00
Kyle Shores
0535edd9c1
Replace ENABLE_FILTER_TESTING with NETCDF_ENABLE_FILTER_TESTING
2024-03-18 15:51:55 -05:00
Kyle Shores
0be7d60580
Replace ENABLE_FILTER_SZIP with NETCDF_ENABLE_FILTER_SZIP
2024-03-18 15:51:53 -05:00
Kyle Shores
a45bd40620
Replace ENABLE_FILTER_BZ2 with NETCDF_ENABLE_FILTER_BZ2
2024-03-18 15:51:50 -05:00
Kyle Shores
68a126538c
Replace ENABLE_FILTER_BLOSC with NETCDF_ENABLE_FILTER_BLOSC
2024-03-18 15:51:48 -05:00
Kyle Shores
e4f9e44db1
Replace ENABLE_FFIO with NETCDF_ENABLE_FFIO
2024-03-18 15:51:45 -05:00
Kyle Shores
08c9fb9a3f
Replace ENABLE_FAILING_TESTS with NETCDF_ENABLE_FAILING_TESTS
2024-03-18 15:51:43 -05:00
Kyle Shores
1ca5d9c89b
Replace ENABLE_EXTREME_NUMBERS with NETCDF_ENABLE_EXTREME_NUMBERS
2024-03-18 15:51:40 -05:00
Kyle Shores
cf90d63bf9
Replace ENABLE_EXTRA_TESTS with NETCDF_ENABLE_EXTRA_TESTS
2024-03-18 15:51:38 -05:00
Kyle Shores
6d1bae4de9
Replace ENABLE_EXTERNAL_SERVER_TESTS with NETCDF_ENABLE_EXTERNAL_SERVER_TESTS
2024-03-18 15:51:35 -05:00
Kyle Shores
ea56b21cd3
Replace ENABLE_EXAMPLE_TESTS with NETCDF_ENABLE_EXAMPLE_TESTS
2024-03-18 15:51:32 -05:00
Kyle Shores
086401f86f
Replace ENABLE_EXAMPLES with NETCDF_ENABLE_EXAMPLES
2024-03-18 15:51:30 -05:00
Kyle Shores
7263727d49
Replace ENABLE_ERANGE_FILL with NETCDF_ENABLE_ERANGE_FILL
2024-03-18 15:51:27 -05:00
Kyle Shores
831bf665ce
Replace ENABLE_DOXYGEN with NETCDF_ENABLE_DOXYGEN
2024-03-18 15:51:24 -05:00
Kyle Shores
ece5a776cb
Replace ENABLE_DLL with NETCDF_ENABLE_DLL
2024-03-18 15:51:21 -05:00
Kyle Shores
9288a53be3
Replace ENABLE_DISKLESS with NETCDF_ENABLE_DISKLESS
2024-03-18 15:51:18 -05:00
Kyle Shores
d270aa8e93
Replace ENABLE_DAP with NETCDF_ENABLE_DAP
2024-03-18 15:51:14 -05:00
Kyle Shores
5bd28e2af4
Replace ENABLE_COVERAGE_TESTS with NETCDF_ENABLE_COVERAGE_TESTS
2024-03-18 15:51:12 -05:00
Kyle Shores
b2275b1f4f
Replace ENABLE_CONVERSION_WARNINGS with NETCDF_ENABLE_CONVERSION_WARNINGS
2024-03-18 15:51:09 -05:00
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
Kyle Shores
0cf9c554d9
removing things I didn't mean to commit
2024-03-15 11:16:50 -05: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
Ward Fisher
443195973a
Merge branch 'main' into find_pnetcdf
2024-03-11 16:02:54 -06:00
Kyle Shores
76f5a08f23
removing need for global compile definition
2024-03-07 10:57:25 -06: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
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
c24a0d0968
bumping cmake version
2024-02-23 09:02:15 -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
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
Kyle Shores
d29a0ef7e9
forcing shared to see if tests pass
2024-02-20 12:14:08 -06:00
Kyle Shores
db805e5388
pic?
2024-02-13 16:28:49 -06:00
Kyle Shores
f9e3247164
merging main, addressing some PR comments
2024-02-07 09:53:45 -06:00
Ward Fisher
e528c8b617
Merge pull request #2774 from ZedThree/export-targets-for-build-dir
...
CMake: Export targets so the build directory can be used directly
2024-02-06 11:18:20 -07:00
Greg Sjaardema
fc76a5a170
Minor -- fix UNset to unset
...
The #2842 PR changed most CMake keywords to lowercase, but missed (a portion) of the UNSET commands which were changed to `UNset`. This follows on to that and pushes them all the way to `unset`
2024-02-01 12:37:06 -07:00
Kyle Shores
e31d535bed
removing some compile things
2024-01-26 14:44:19 -06:00
Kyle Shores
5cd1f4e9b1
leaving HAVE_CONFIG_H as top level definition for now
2024-01-26 14:28:16 -06:00
Kyle Shores
d816309e53
targeting netcdf for compile definitions
2024-01-26 13:56:19 -06:00
Kyle Shores
207a70ef9a
undoing packaging
2024-01-26 13:51:19 -06:00
Kyle Shores
ca182c0979
using target_sources
2024-01-26 13:29:38 -06:00
Peter Hill
25dc1faa60
Merge branch 'main' into export-targets-for-build-dir
...
* main: (110 commits)
Escape a character causing a doxygen error.
Updated release notes.
Added a comment block for future reference.
more syntax fixes
Update CMakeLists.txt
CMake: Find HDF5 header we can safely include for other checks
moving functions and macros to new file, lowercase things
Update release notes.
lowercase
lower case
lowercase
moving functions and macros to a file
moving the dependencies inclusion
CMake: Add support for UNITY_BUILD
removing debug messages
actually adding the dependencies file...
putting dependencies into separate file
Define USE_SZIP variable for nc-config.cmake.in
matching cmake variables in autotools configuration
moving the version into the project command in cmake
...
2024-01-24 11:26:44 +00:00
Peter Hill
3c59bf6f54
CMake: Tidy exporting targets
...
Fixes comments from review
2024-01-24 11:20:08 +00:00
Peter Hill
4aa6d38bc4
CMake: Consistent name for feature variable
2024-01-24 10:51:24 +00:00
Peter Hill
a33ba11450
Merge branch 'main' into find_pnetcdf
...
* main:
Escape a character causing a doxygen error.
Updated release notes.
Added a comment block for future reference.
more syntax fixes
Update CMakeLists.txt
CMake: Find HDF5 header we can safely include for other checks
moving functions and macros to new file, lowercase things
Update release notes.
lowercase
lower case
lowercase
moving functions and macros to a file
CMake: Add support for UNITY_BUILD
Change signature of `nczm_sortenvv` to take `size_t`
Try to more consistently use `size_t` for argument of `nclistlength`
Try to more consistently use `size_t` for `nclistget` index argument
Include header for `size_t` in `nclist.h`
2024-01-24 10:04:53 +00:00
Kyle Shores
887c479533
setting up packaging in its own directory, using netcdf as a target for compile options
2024-01-19 09:25:24 -06:00
Kyle Shores
05ce85be78
more syntax fixes
2024-01-18 15:07:13 -06:00
Kyle Shores
a40c7847f9
Update CMakeLists.txt
...
Co-authored-by: Peter Hill <zed.three@gmail.com>
2024-01-18 15:02:48 -06:00