Commit Graph

3179 Commits

Author SHA1 Message Date
Ward Fisher
fbdea5c4a0 Working in support of https://github.com/Unidata/netcdf-c/issues/188 . Exploratory work. 2016-02-29 15:08:09 -07:00
Ward Fisher
d813448e2b Put CONTRIBUTING.md back in top level of repository. 2016-02-24 10:55:56 -07:00
Ward Fisher
e1cfa5aca1 Added a roughed-in issue template. 2016-02-24 10:55:12 -07:00
Ward Fisher
fb53bbb108 Moved CONTRIBUTING.md into .github directory. 2016-02-24 10:31:21 -07:00
Ward Fisher
08e49122d0 Merge branch 'patch-11' of https://github.com/gsjaardema/netcdf-c into merge 2016-02-23 16:33:23 -07:00
Ward Fisher
c08ae9b7b6 Merge branch 'patch-10' of https://github.com/gsjaardema/netcdf-c into merge 2016-02-23 16:32:59 -07:00
Ward Fisher
da71134c8a Updated release notes. 2016-02-23 19:10:57 +00:00
Ward Fisher
1c1141d43e Added missing install for cmake-based builds, netcdf_mem.h. Also, moved install directives for header files into include/CMakeLists.txt. This is in support of https://github.com/Unidata/netcdf-c/issues/227 2016-02-23 18:12:16 +00:00
Greg Sjaardema
71af39c8b3 Fix HDF5 library order -- static build
When using static libraries, some systems require that the libraries be ordered in dependency order.  Since libhdf5_hl.a depends on symbols from libhdf5.a, it (libhdf5_hl.a) should be listed first.  This was discovered and verified on RHEL-6 with gcc-5.2.0.
2016-02-22 11:06:23 -07:00
Greg Sjaardema
2da555a2d5 Fix setting of HDF5 include directory path when explicitly specified
The HDF5 include directory needs to be updated when explicitly setting the HDF5 libraries and include path.  This is done on line 561 when FindPackage finds the hdf5 libraries, but was not being done in the manual setting.
2016-02-22 10:54:37 -07:00
Ward Fisher
81d28b859f Deleted stray debugging file. 2016-02-19 15:33:11 -07:00
Ward Fisher
332d71fd1a Merge branch 'master' into gh223 2016-02-19 15:32:50 -07:00
Ward Fisher
d8b65ccea1 Fix for https://github.com/Unidata/netcdf-c/issues/223 2016-02-19 15:05:39 -07:00
Ward Fisher
e6c2f7a15e Merge pull request #224 from Unidata/gh221
Fix for github issue #221
2016-02-19 13:40:08 -07:00
Ward Fisher
d5afdffed7 Merge branch 'master' into gh221 2016-02-19 13:07:28 -07:00
Ward Fisher
5224607d7b Deleted stray debugging file pre-merge. 2016-02-19 12:25:24 -07:00
Ward Fisher
a75cb302df Removed an error in nc_test4/Makefile.am 2016-02-19 11:06:56 -07:00
Ward Fisher
7983e926a2 Updated release notes. 2016-02-19 10:56:44 -07:00
Ward Fisher
dde10a7461 Corrected a missing suffix in Makefile.am 2016-02-19 10:52:16 -07:00
Ward Fisher
1affd12fc8 Wired tests for https://github.com/Unidata/netcdf-c/issues/221 into a shell script so that the generated files can be checked easily with ncdump. Added the test and associated files to both cmake and autotools build systems. 2016-02-19 10:16:42 -07:00
Ward Fisher
db84f39adc Tentative, robust fix for https://github.com/Unidata/netcdf-c/issues/221 that does not immediately introduce other issues into ncdump. Broader validation pending. 2016-02-18 15:42:03 -07:00
Ward Fisher
bb7b0d3f32 Merge branch 'gh221' of https://github.com/Unidata/netcdf-c into gh221 2016-02-18 14:46:31 -07:00
Ward Fisher
9791b1a397 Tentative fix for initial issue at http://github.com/Unidata/netcdf-c/issues/221 . investigating knock-on issues now. 2016-02-18 14:46:16 -07:00
Ward Fisher
08e8374b02 Tentative fix for initial issue at http://github.com/Unidata/netcdf-c/issues/221, investigating knock-on issues now. 2016-02-18 14:45:57 -07:00
Ward Fisher
e2eda755e3 Tweaked empty test to check for limited, unlimited dimensions. Also added a gdb command file for ease of debugging. 2016-02-18 13:59:53 -07:00
Ward Fisher
791800145a Added test file for debugging issue. 2016-02-18 17:33:49 +00:00
Ward Fisher
845f3b2282 Merge branch 'gspatch8' 2016-02-17 14:20:03 -07:00
Ward Fisher
ecc635014c Merge branch 'patch-8' of https://github.com/gsjaardema/netcdf-c into gspatch8 2016-02-17 12:40:20 -07:00
Ward Fisher
e9f07bd681 Merge branch 'patch-7' of https://github.com/gsjaardema/netcdf-c into gsjaardema-patch-7 2016-02-16 15:34:26 -07:00
Ward Fisher
0eff434098 Renamed test file to be more reflective for what it is doing. 2016-02-16 14:54:10 -07:00
Ward Fisher
4ccad07a6b Have duplicated issue reported in #221 at github. 2016-02-16 14:52:03 -07:00
Ward Fisher
654a6e39e3 Additional work debugging issue. 2016-02-16 14:40:09 -07:00
Ward Fisher
1807cb7aa2 Roughing in a test to create the failure described in https://github.com/Unidata/netcdf-c/issues/221 2016-02-16 11:00:09 -07:00
Ward Fisher
47dcd00bb7 Added test file for debugging https://github.com/Unidata/netcdf-c/issues/221. 2016-02-16 10:23:53 -07:00
Ward Fisher
7e7fa31b5f Merge pull request #215 from gsjaardema/patch-5
Support user-specified hdf5 and hdf5_hl libraries
2016-02-16 10:19:15 -07:00
Greg Sjaardema
2d3278c58b Update comment
If pnetcdf support is enabled, then  NC_HAS_PARALLEL is defined to 1 even if HDF5 is not enabled.  Fix comment to make this clearer.
2016-02-10 15:07:19 -07:00
Greg Sjaardema
e8280efcb2 Generate correct results from cmake-generated nc-config
A couple of the `has_XX` variables seem to have values of OFF or ON instead of `empty` or ON which causes incorrect output from the nc-config script since it is using `-z` to test whether the variable is non-empty.  This causes nc-config to incorrectly report that the library supports HDF5 or has the version 2 api.
2016-02-10 15:03:19 -07:00
Greg Sjaardema
ebc25610ef Merge branch 'master' into patch-5 2016-02-09 13:43:06 -07:00
Greg Sjaardema
126a319230 Fix version dependency.
Required PNetCDF version is 1.6.1 or greater; not 1.6.0 as I previously thought.

Note that this is pull request may (partially) satisfy Issue #194 which I just found.
2016-02-09 11:23:33 -07:00
Greg Sjaardema
d123157771 Enable PNetCDF settings in cmake build
One possible solution to finding the PNetCDF library and testing for the correct version in the cmake build.
2016-02-09 07:23:09 -07:00
Greg Sjaardema
edfffb4b14 Merge branch 'master' into patch-5 2016-02-09 07:05:54 -07:00
Ward Fisher
1a42d4ff99 Corrected version string to reflect development branch is 4.4.1 in support of correcting https://github.com/Unidata/netcdf-c/issues/214. 2016-02-08 17:36:04 -07:00
Greg Sjaardema
df58364f00 Support user-specified hdf5 and hdf5_hl libraries
If the netcdf cmake build is configured with explicitly specified hdf5 c and hl libraries:
```
    -DHDF5_C_LIBRARY:PATH=${ACCESS}/lib/libhdf5.dylib \
    -DHDF5_HL_LIBRARY:PATH=${ACCESS}/lib/libhdf5_hl.dylib \
    -DHDF5_INCLUDE_DIR:PATH=${ACCESS}/include \
```
Then it looks like the HDF5_C_LIBRARIES and HDF5_HL_LIBRARIES variables do not get set and then this causes the HDF5 libraries to be omitted from the `TLL_LIBS` symbol in liblib/CMakeLists.txt.  This is subsequently used to build `ALL_TLL_LIBS` which is used for `LIBS` which is output as the `Extra libraries:        @LIBS@` in libnetcdf.settings.in 

The output for `-- Linking against:` is also incorrect as it omits the hdf5 libraries:   Output without suggested change:
```
-- Linking against:      /usr/lib/libdl.dylib;/usr/lib/libm.dylib;/opt/local/lib/libz.dylib;/opt/local/lib/libcurl.dylib
(later in file)
Extra libraries:	-ldl -lm -lz -lcurl
```
versus output with suggested change:
```
-- Linking against:      /Users/gdsjaar/src/seacas-parallel/lib/libhdf5_hl.dylib;/Users/gdsjaar/src/seacas-parallel/lib/libhdf5.dylib;/usr/lib/libdl.dylib;/usr/lib/libm.dylib;/opt/local/lib/libz.dylib;/opt/local/lib/libcurl.dylib
(later in file)
Extra libraries:	-lhdf5_hl -lhdf5 -ldl -lm -lz -lcurl
```
This also causes a link failure when building libnetcdf.dylib
2016-02-08 17:20:48 -07:00
Ward Fisher
55b24e2964 Added tst_mode to CMakeLists.txt 2016-02-04 19:12:15 +00:00
Ward Fisher
03b7a103ad Merge pull request #210 from Unidata/gh206
merging work @dmh did to address #206
2016-02-03 10:47:01 -07:00
Dennis Heimbigner
e03785069a Merge branch 'gh206' of https://github.com/Unidata/netcdf-c into gh206 2016-02-02 13:07:15 -07:00
Dennis Heimbigner
66fcf79d77 Github issue: https://github.com/Unidata/netcdf-c/issues/206
Re e-eupport VGQ-678069
It was noticed that an attribute value of "nan." was being treated as
legal (it should be "nan"). The reason is that sscanf was not be checked
to see that all the attribute value characters were being read.
Solution is to verify that all characters were being consumed.
2016-02-02 13:06:57 -07:00
Ward Fisher
20ce7edf32 Merge pull request #209 from Unidata/gh208
Fix github issue: https://github.com/Unidata/netcdf-c/issues/208
2016-02-02 12:42:00 -07:00
Dennis Heimbigner
80a07f2375 Merge branch 'gh206' of https://github.com/Unidata/netcdf-c into gh206 2016-02-01 16:21:32 -07:00
Dennis Heimbigner
b2a25bde13 Github issue: https://github.com/Unidata/netcdf-c/issues/206
Re e-eupport VGQ-678069
It was noticed that an attribute value of "nan." was being treated as
legal (it should be "nan"). The reason is that sscanf was not be checked
to see that all the attribute value characters were being read.
Solution is to verify that all characters were being consumed.
2016-02-01 16:19:34 -07:00