Commit Graph

426 Commits

Author SHA1 Message Date
Ward Fisher
9ea61d114b Corrected an issue detecting parallel hdf5 properly. 2017-03-06 15:34:14 -07:00
Ward Fisher
42c3be4823 Updated IP address of target cdash instance. 2017-03-01 12:34:49 -07:00
Ward Fisher
78c0f34c82 Merging master into branch. 2017-02-27 11:00:24 -07:00
Ward Fisher
7cb03504ed Merge branch 'master' into issue365.dmh 2017-02-23 13:55:10 -07:00
Ward Fisher
f96e0e8112 Merge branch 'master' into issue365.dmh 2017-02-22 12:17:01 -07:00
Ward Fisher
fa1c96a67f Attempting to fix an issue. 2017-02-22 09:55:13 -07:00
Ward Fisher
c2ee17acf6 Corrected for new cmake variables used by hdf5. 2017-02-21 17:00:45 -07:00
Dennis Heimbigner
96bd037560 re: https://github.com/Unidata/netcdf-c/issues/365
Following command fails under visual studio.
    ncdump -h http://thredds.ucar.edu/thredds/dodsC/nexrad/composite/gini/n0r/1km/20170216/Level3_Composite_n0r_1km_20170216_1635.gini

The problem is that sscanf for windows does not appear to support
scanning 8bit integers: it appears to only allow scanning of characters.

Solution:
Scan the input as an integer (for type Byte) or unsigned int (for type UByte)
and then recast the result as a char or unsigned char.

Primary code fix is in libdap2/dapcvt.c#dapcvtattrval
2017-02-19 21:41:51 -07:00
Ward Fisher
da28564469 Updated for Visual Studio support, in support of https://github.com/Unidata/netcdf-c/pulls/364 2017-02-17 15:38:55 -07:00
Ward Fisher
7cce9c30f0 Updated CMakeLists.txt to work on Windows. 2017-02-17 13:00:12 -07:00
Ward Fisher
581737b04e Integrating a big endian test. 2017-02-08 14:51:41 -07:00
Ward Fisher
6ff5ebf12f CMake Sync Issues 2017-02-08 10:31:15 -07:00
Ward Fisher
7c68a255c9 Merge branch 'master' into ghpull-335 2017-01-31 12:25:46 -07:00
Ward Fisher
870b6c534f Working out an error with unistd.h in windows. 2017-01-30 14:54:00 -07:00
Ward Fisher
0d2727d9da Merging pull request from gsjaardema, see https://github.com/Unidata/netcdf-c/pull/335 for more information. 2017-01-30 12:45:50 -07:00
Ward Fisher
209c31d3f3 Bringing config.h as generagted by cmake in line with config.h as generated by autotools. 2017-01-27 17:41:03 -07:00
Greg Sjaardema
e0269d6cac Add hdf5 collective metadata api detection to cmake build 2016-12-01 13:35:10 -07:00
Greg Sjaardema
7c808e849b Get parallel hdf5 detection working 2016-12-01 13:35:04 -07:00
Ward Fisher
becffaa784 Bumped SO version. 2016-11-21 10:25:30 -07:00
Ward Fisher
f4a5d38992 Corrected issue for systems that don't have libsz installed. 2016-11-10 18:06:29 -07:00
Ward Fisher
12d9891305 Moved stanza for NC_EXTRA_DEPS before checking for other libraries. 2016-11-10 23:22:02 +00:00
Ward Fisher
af9ffb7883 Added EXTREME_NUMBERS option to cmake, based on option in autotools, which had somehow not made it's way over previously. 2016-09-27 11:20:41 -06:00
Bas Couwenberg
6e5c74550d Fix HDF5 include directory with CMake >= 3.6.0.
HDF5_INCLUDE_DIR has been deprecated some time ago,
only HDF5_INCLUDE_DIRS is set for CMake >= 3.6.0.
2016-08-28 15:26:35 +02: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
b2b8499f53 Got distcheck working, corrected some parallel test logic in cmakelists. 2016-06-09 13:21:28 -06:00
Bas Couwenberg
aa8f23c5bb Use SOURCE_DATE_EPOCH instead of current date.
The environment variable is used to support Reproducible Builds.

https://reproducible-builds.org/specs/source-date-epoch/
2016-05-15 17:20:18 +02:00
Ward Fisher
287e73ca26 Bumping SO Version correctly. 2016-05-13 11:51:57 -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
b4dc1dca19 More cmake fixes 2016-05-07 14:32:07 -06:00
Dennis Heimbigner
a4dea6bf83 Again, forgot to fix CMakeLists.txt
to match configure.ac (sigh!).
ENABLE_FILEINFO should be
enabled iff NETCDF4 is enabled.
2016-05-07 14:32:07 -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
3f773258bd Corrected an issue with hashmap and missing random() function on Windows using Visual Studio 2013 2016-04-11 16:07:27 -06:00
Ward Fisher
83f1e01409 SOVersion Bump. 2016-04-11 09:59:24 -06:00
Ward Fisher
493a6e5d62 Found pre-existing call to H5Pset_libver_bounds, modified it so that the generated files would be created without the 1.10 specific things. 2016-04-08 21:36:08 +00:00
Ward Fisher
fc49992012 Added check to cmake for H5Pset_libver_bounds 2016-04-08 21:13:33 +00: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
b19b807e8b Working around a couple of problematic calls to fstat in support of https://github.com/Unidata/netcdf-c/issues/188 . No idea why these were a problem in VS14 (Visual Studio 2015) and not in VS12 (Visual Studio 2013). It's possible there are other, similar issues out there. We'll see what turns up when we run all the tests. These changes were tested against nc_test4/tst_large2.c 2016-03-02 13:03:29 -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
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
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
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
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
79c021712a Removed generated tests from source control. Ensuring generated files are regenerated if m4 is present. 2016-01-22 12:03:28 -07:00
Ward Fisher
60644f3c4c Bumped next development version. 2016-01-13 10:01:34 -07:00
Ward Fisher
d11ed3c478 Bumped SO version in CMakeLists.txt 2016-01-11 15:27:57 -07:00
Ward Fisher
6867960a0c Removed debugging information. 2016-01-08 12:59:56 -07:00
Ward Fisher
65aaac62d8 Tweaked CMakeLists a bit more. 2016-01-08 12:59:37 -07:00