mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-12-27 08:49:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,197 Commits 90 Branches 75 Tags 88 MiB
0cbc849fbb
Commit Graph

181 Commits

Author SHA1 Message Date
Ed Hartnett
46d3bca8f4 removed non-working BUILD_DLL target 2017-11-30 05:40:17 -07:00
Ward Fisher
1ca5f8c993 Updated SO version, other little issue with ncdump Makefile.am. 2017-10-17 14:56:22 -06:00
Dennis Heimbigner
07d67e737a 1. Cleaned up some holdover debug code. 
2. modified ncdap_tests to remove <cr>
   from generated output before comparison
   to expected. This is a hack because
   my other attempts to force windows to use
   binary mode have not worked.
 2017-07-25 14:58:29 -06:00
Dennis Heimbigner
6505ff6880 Force file opens to default to binary mode for cygwin and windows 2017-07-17 18:58:45 -06:00
Ward Fisher
26f8ebda46 Computed new interace version flags. 2017-05-30 13:05:31 -06:00
Dennis Heimbigner
6d8809100f Fix pull request https://github.com/Unidata/netcdf-c/pull/374 (dap4.dmh) 
1. When running under windows (as opposed to cygwin)
   we need to make sure to not user /cygdrive/ file paths.
   This was ocurring in libdap4/d4read.c, but may occur
   elsewhere.
2. Shell scripts in the git repo are not being checked-out
   with the executable mode set. Had core.filemode set to false.
   Was a major hassle to fix.
 2017-04-03 21:39:44 -06:00
Dennis Heimbigner
3db4f013bf Primary change: add dap4 support 
Specific changes:
1. Add dap4 code: libdap4 and dap4_test.
   Note that until the d4ts server problem is solved, dap4 is turned off.
2. Modify various files to support dap4 flags:
	configure.ac, Makefile.am, CMakeLists.txt, etc.
3. Add nc_test/test_common.sh. This centralizes
   the handling of the locations of various
   things in the build tree: e.g. where is
   ncgen.exe located. See nc_test/test_common.sh
   for details.
4. Modify .sh files to use test_common.sh
5. Obsolete separate oc2 by moving it to be part of
   netcdf-c. This means replacing code with netcdf-c
   equivalents.
5. Add --with-testserver to configure.ac to allow
   override of the servers to be used for --enable-dap-remote-tests.
6. There were multiple versions of nctypealignment code. Try to
   centralize in libdispatch/doffset.c and include/ncoffsets.h
7. Add a unit test for the ncuri code because of its complexity.
8. Move the findserver code out of libdispatch and into
   a separate, self contained program in ncdap_test and dap4_test.
9. Move the dispatch header files (nc{3,4}dispatch.h) to
   .../include because they are now shared by modules.
10. Revamp the handling of TOPSRCDIR and TOPBUILDDIR for shell scripts.
11. Make use of MREMAP if available
12. Misc. minor changes e.g.
	- #include <config.h> -> #include "config.h"
	- Add some no-install headers to /include
	- extern -> EXTERNL and vice versa as needed
	- misc header cleanup
	- clean up checking for misc. unix vs microsoft functions
13. Change copyright decls in some files to point to LICENSE file.
14. Add notes to RELEASENOTES.md
 2017-03-08 17:01:10 -07:00
Ward Fisher
becffaa784 Bumped SO version. 2016-11-21 10:25:30 -07:00
Ward Fisher
0927fed943 Modified previous change. 2016-11-11 00:39:19 +00:00
Ward Fisher
7d1289fb64 Started replacing hack using TLL_LIBS with CMAKE_REQUIRED_LIBRARIES 2016-11-10 23:30:01 +00:00
Dennis Heimbigner
0cf1e2c49f re: Github issue netcdf-c 300 
Modified provenance code to allocate the minimal space
needed for _NCProperties attribute in file.  Basically
required using malloc in the provenance code and in ncdump.
Otherwise should cause no externally visible effects.
Also removed the ENABLE_FILEINFO from configure.ac since
the provenance code is no longer optional.
 2016-08-08 09:24:19 -06:00
Ward Fisher
a4189e9dd3 Bumped SO version. 2016-06-28 13:33:12 -06:00
Ward Fisher
6aa3763622 Bumped version humber in autotools file. 2016-06-28 13:26:02 -06:00
Ward Fisher
2e71768c47 Fenceposted includes to nc4internal.h in support of https://github.com/Unidata/netcdf-c/issues/275 2016-06-08 11:26:37 -06:00
Ward Fisher
287e73ca26 Bumping SO Version correctly. 2016-05-13 11:51:57 -06:00
Ward Fisher
595474d71b Preparations for 4.4.1-rc2 2016-05-13 11:48:49 -06:00
Ward Fisher
10f85caf26 Rolled back SO version to 11 after incorrectly bumping it in the 4.4.1 rc1 release. 2016-05-12 16:04:04 -06:00
Dennis Heimbigner
11a259ad86 Add provenance info for netcdf-4 files. 
This consists of a persistent attribute named
_NCProperties plus two computed attributes
_IsNetcdf4 and _SuperblockVersion.
See the 'Provenance Attributes' section
of docs/attribute_conventions.md for details.
 2016-05-07 14:32:07 -06:00
Ward Fisher
83f1e01409 SOVersion Bump. 2016-04-11 09:59:24 -06:00
Dennis Heimbigner
a8ff523677 ckp 2016-04-06 14:05:58 -06:00
Ward Fisher
719ddac946 Adding cmake infrastructure in support of https://github.com/Unidata/netcdf-c/issues/228 2016-03-07 14:04:52 -07:00
Ward Fisher
eada3d5a55 Incrementing so version. 2016-01-11 15:20:55 -07:00
Ward Fisher
612b35a84c Merge branch 'master' into cdf-5, in preparation for merging the CDF-5 functionality into the master branch. This will be the key new feature for netcdf 4.4.0. 2015-11-05 13:40:35 -07:00
Ward Fisher
3c0a487674 Applying a patch for cygwin submitted by Marco Atzeri. 2015-11-02 16:26:50 -07:00
Ward Fisher
48fedd0d19 Changed the method by which the cmake version was being compared. 2015-10-20 16:20:04 +00:00
Ward Fisher
6341067733 Made build system to use conditional. 2015-10-20 10:10:55 -06:00
Ward Fisher
cdb0ae4baa In an effort to accomodate a broader range of linux platforms, trying to reduce the minimum supported version of cmake. See (https://github.com/Unidata/netcdf-c/issues/135). 2015-10-20 09:59:42 -06:00
Ward Fisher
29a3f8683b Removed old cdmr cmake config. 2015-10-09 13:18:39 -06:00
dmh
7d9ad096b9 cleanup 2015-10-09 10:12:11 -06:00
dmh
49597a64af merge-squash 2015-10-09 10:12:11 -06:00
Ward Fisher
a002bc884e Corrected a bug with parallel build in CMakeLists.txt 2015-08-17 15:45:39 -06:00
dmh
fab66699d1 Moved libsrc5 to libsrcp 
because pnetcdf is used for
more than CDF-5 files.
 2015-08-14 20:39:56 -06:00
Ward Fisher
099b6eb05b Bumped version info. 2015-06-04 15:19:51 -06:00
Ward Fisher
64e0d2a44e Added a new test for h4 endianness. [NCF332] 2015-05-28 17:13:15 -06:00
Ward Fisher
1eaa18dbd5 Moved dependencies into proper location in relation to netcdf.dll to avoid 'can't find hdf5.dll, etc' errors. 2014-12-05 11:19:02 -07:00
Ward Fisher
d3e1f2a82a Modified Settings used to generate Binary installer for Windows, so that the user is given the option of adding the binaries to the system path. 2014-12-02 13:58:23 -07:00
Ward Fisher
c0bc240a3a Reworked a little bit. Now two new targets are added, build-netcdf-fortran and install-netcdf-fortran. The latter can be run as root, if need be. 2014-11-19 14:29:32 -07:00
Ward Fisher
a4724f7aee Initial attempt at getting netcdf-c to automatically build and install netcdf-fortran. 2014-11-18 10:50:19 -07:00
Ward Fisher
a90c9829a2 Corrected issue where libraries were being linked against multiple times. 2014-11-03 10:43:43 -07:00
Nico Schlömer
9cc1e8035a rename HDF5_*_LIBRARY to HDF5_*_LIBRARIES 
This makes sure that netCDF plays nicely with FindHDF5.cmake
from CMake.

Conflicts:
	liblib/CMakeLists.txt
 2014-10-08 12:38:20 +02:00
Ward Fisher
5b62a7199b Added NC_EXTRA_DEPS option to netcdf-c 2014-09-29 12:04:35 -06:00
Nico Schlömer
847cbf66dc fix link bug for static builds 2014-08-21 12:03:41 +02:00
Nico Schlömer
d2ee2dff31 remove old export functionality, move new in place 2014-08-21 10:11:30 +02:00
Ward Fisher
7f812b367e Manual merge of pull request https://github.com/Unidata/netcdf-c/pull/64 contributed by nschloe. Assorted CMake improvements. 2014-06-11 15:51:31 -06:00
Ward Fisher
2e1c5bb1cb Added a netcdf_lib_version variable to correspond to the version computed by autotools. Also changed netcdf_so_version to 7 in cmake. This way cmake-based builds give us the same library names as autotools-based builds. 2014-05-12 16:05:39 -06:00
Ward Fisher
5a693d7326 Merged pull requestion from nschloe, #48. 2014-04-21 16:11:48 -06:00
Ward Fisher
733f6257b0 Updating cmake shared_linker_flags as suggested by Nico Schlomer: https://github.com/Unidata/netcdf-c/issues/46 
Fixed indentation.

Updated .gitignore.

Added a macro to make it easy to check to see if the linker supports a particular flag.  Debug builds now pass the -w1,--no-undefined if it is detected the linker supports it.
 2014-04-02 15:54:05 -06:00
dmh
af566dd300 In preparation for adding dap4 support, I have cleaned up 
the libdap2 code to make it dap2 protocol + netcdf classic
only.
 2014-03-24 14:02:52 -06:00
Ward Fisher
154c2a6edf Stopped tracking a cmake-specific pkgconfig template; using the same one as autotools. Tightened up cmake summary a little, now a pkg-config file is generated. 2014-02-06 16:17:30 -07:00
Ward Fisher
8b368d0c3b Corrected a CMake error on Linux. 2013-10-07 12:58:38 -06:00
Ward Fisher
1cb69fb402 Corrected an issue on Windows 2013-10-07 12:39:54 -06:00
Ward Fisher
c8baf5c0e3 Updating how Windows tracks HDF5 libraries to link against. 2013-10-07 11:14:24 -06:00
Ward Fisher
09d4854165 Corrected a CMake issue which appeared to happen between two different versions of OSX. 2013-10-07 10:18:44 -06:00
Ward Fisher
c61b058807 Updated CMakeLists.txt to only link against the HDF5_hdf5 and HDF5_hdf5_hl libraries. 2013-10-04 17:07:10 -06:00
Orion Poplawski
392d6bcbf6 Use GNUInstallDirs to install into /usr/lib64 as needed 2013-08-13 10:00:22 -06:00
Ward Fisher
b4e198d163 Added '--enable-dynamic-loading' to autotools-based builds, and 
-DENABLE_DYNAMIC_LOADING to cmake-based builds.

This will allow for compatibility with hdf5 1.8.11 builds that
have enabled dynamic building (depends on libdl).

See Jira ticket NCF-258
 2013-06-10 21:48:11 +00:00
Ward Fisher
33d3d06971 Added initial 'make dist', 'make distcheck' support to 
CMake-based builds.
 2013-06-03 16:42:04 +00:00
Dennis Heimbigner
c583f91992 merge with trunk and fix conflicts 2013-05-10 17:04:28 +00:00
Ward Fisher
df9a54b689 o Fixed the SOVERSION for CMake-based builds. 
o Updated autotools-based build to include files required for CMake-based 
builds.

o Updated Markdown-based documentation processed by Doxygen to include a
CMake FAQ.
 2013-05-08 21:59:11 +00:00
Dennis Heimbigner
dea3c726c8 merge trunk into this branch 2013-03-15 20:31:07 +00:00
Ward Fisher
ddf3c31bb0 Corrected a handful of syntax issues in CMake config files, 
probably introduced more.  

Added CMake-related files to Makefile.am files for inclusion
when creating a distribution package.
 2013-02-20 23:28:28 +00:00
Ward Fisher
51848614c3 Corrected parallel support in CMake, including 
library checks and parallel IO tests.  Updated 
CMake-related documentation.
 2013-02-12 22:22:54 +00:00
Ward Fisher
91188cea7a Merging CMake branch into trunk. Changes include: 
CMake related changes in CMakeLists.txt files,
cmake_config.h.in. Other changes relate to 
Windows-specific issues, and changes made
when regenerating generated source files.
 2013-01-15 22:43:09 +00:00
Ward Fisher
ff631c8156 Merged latest changes from cmake branch. 
o Improved CMake support.
o Cmake module compatibility (netcdf-config*.cmake.in).
 2012-11-19 21:43:12 +00:00
Ward Fisher
ef140d0df7 Corrected an issue with custom .dll names. 2012-10-31 22:30:10 +00:00
Ward Fisher
1aa9a95cbb Added new option to allow for custom library names. 2012-10-31 22:17:33 +00:00
Ward Fisher
28741e1761 2012-10-24 19:49:31 +00:00
Ward Fisher
45d035d587 Changed some options 2012-10-15 21:58:13 +00:00
Ward Fisher
8e6a7cb056 Fixed error building shared libs on 64-bit linux. 2012-10-03 16:39:27 +00:00
Ward Fisher
7f8b10503c 2012-10-03 15:56:44 +00:00
Ward Fisher
44b519cf82 2012-10-03 15:51:31 +00:00
Ward Fisher
d6dd554ff4 2012-10-02 22:56:12 +00:00
Ward Fisher
dfed98c691 Add code to generate an export library. 2012-09-24 21:31:59 +00:00
Ward Fisher
0d221a4e20 2012-09-20 21:18:20 +00:00
Ward Fisher
a1fda0f885 2012-09-13 22:07:35 +00:00
Ward Fisher
2de3388cf1 Additional CMake usage. 2012-09-13 18:27:23 +00:00
Ward Fisher
b81dc4373d Changed how HDF5 is located. 2012-08-29 21:33:28 +00:00
Ward Fisher
9e8cfcf808 Additional CMake support, CPack support. 2012-08-29 18:58:08 +00:00
Ward Fisher
8f9120e3a9 Modified to work on Windows 2012-08-20 22:49:53 +00:00
Ward Fisher
9b3d24cbc0 2012-08-10 21:44:00 +00:00
Ward Fisher
5e9d4000e1 Added additional tests in CMake 2012-08-10 20:55:07 +00:00
Ward Fisher
14619ec4c4 2012-08-09 18:40:41 +00:00
Ward Fisher
0607b62375 Added coverage test flags to CMakeLists.txt files. 2012-08-09 17:07:41 +00:00
Ward Fisher
eb238ae3e2 2012-08-08 22:46:28 +00:00
Ward Fisher
05cde40552 2012-08-08 22:31:28 +00:00
Ward Fisher
77bd943296 2012-08-08 17:24:32 +00:00
Ward Fisher
ac05a19ef8 Updated for advanced CMake functionality. 2012-08-06 17:27:08 +00:00
Ward Fisher
751c41928a Additional CMake changes. 2012-08-03 22:24:29 +00:00
Ward Fisher
0d90326575 Integrated latest changes to trunk, added preliminary CPack support. 2012-08-02 22:56:57 +00:00
Ward Fisher
1af2b768b0 Merged changes from trunk (mainly Dennis' oc2 inclusion). 2012-07-31 22:04:25 +00:00
Dennis Heimbigner
42999f4c7c move from oc1.0 to oc2.0; create new dir oc2 2012-07-31 20:34:13 +00:00
Ward Fisher
adfd7579de Additional CMake files 2012-07-25 22:09:19 +00:00
Ward Fisher
dfdad6adf7 Additional CMake support changes. 2012-07-24 22:53:58 +00:00
Ward Fisher
31ea8ffaa5 CMake Changes 2012-07-20 21:16:27 +00:00
Ward Fisher
4af02f4c75 CMake support changed 2012-07-19 22:11:10 +00:00
Ward Fisher
71075cee2e Additional changes in support of CMake. 2012-07-18 21:12:58 +00:00
Ward Fisher
d66293beca More changes in support of CMake support 2012-07-17 21:44:41 +00:00
Dennis Heimbigner
aebd11348a 1)Integrate the oc with improved performance 2012-01-29 18:56:29 +00:00
Russ Rew
6371346c7c Use -version-info rather than -version-number for generating libtool soname in liblib/Makefile.am 2012-01-13 20:51:12 +00:00
Russ Rew
e39dc1ed39 Revert libtool version to 7.1.1. Disable libdiskless. 2012-01-12 23:27:30 +00:00