Commit Graph

390 Commits

Author SHA1 Message Date
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
Ward Fisher
60ef454a7f Refactoring CMakeLists.txt to make the HDF5-related logic a little more clear. Or at least, better documented. 2016-01-08 10:56:25 -07:00
Ward Fisher
d75a3ad38f Typo correction. 2016-01-07 15:50:04 -07:00
Ward Fisher
6d400c8e43 Making an allowance for Linux. 2016-01-07 15:48:31 -07:00
Ward Fisher
c822d4c6df Work progresses on a CMake system that will work with hdf5 1.8.15 and 1.8.16, as well as that will work with Windows and Linux. 2016-01-07 15:43:17 -07:00
Ward Fisher
0b373d8cf1 Work progresses, we need to handle shared and static hdf5 separately it turns out. See examples provided by hdf5 group. 2016-01-07 15:22:11 -07:00
Ward Fisher
2aa17ffb2e Additional tweaks. 2016-01-07 14:53:39 -07:00
Ward Fisher
b2aaaad1ce Restricted prior fix to visual studio only as it doesn't appear necessary for OSX/Linux. 2016-01-07 14:17:58 -07:00
Ward Fisher
e0a0ea7610 Removed debugging information in CMakeLists.txt. 2016-01-07 14:15:05 -07:00
Ward Fisher
2d25f9b915 Updated CMakeLists to explicitely look for static or shared hdf5 libraries. Required as part of hdf5 1.8.16, and is documented in https://github.com/Unidata/netcdf-c/issues/186 2016-01-07 14:11:44 -07:00
Ward Fisher
3bb57f0a8e Extending debug information for cmake and hdf5 1.8.16 on Windows. 2016-01-06 14:18:26 -07:00
Ward Fisher
34125fdecd Trying to nail down name of hdf5 library variable for hdf5 1.8.16. 2016-01-06 13:05:52 -07:00
Ward Fisher
cee769cc1e Converting CHAR_IS_SIGNED over to autoconf-style __CHAR_UNSIGNED__ 2015-12-28 21:27:27 +00:00
Ward Fisher
2ea988f84d Added a check for signed char. 2015-12-22 12:02:18 -07:00
dmh
cbb6df3232 Github issue 152: https://github.com/Unidata/netcdf-c/issues/152
User request to have all orphaned DAP2 attributes kept as netcdf
global attributes. This is primarily a change in the oc code
nplus testcase dataset changes.

Result may be inconsistent with netcdf-Java output.
2015-11-29 20:38:12 -07:00
Ward Fisher
05034bfd57 More cleaning up of configuration status messages. 2015-11-17 17:14:22 -07:00
Ward Fisher
d72b108494 Cleaning up netcdf status message. 2015-11-17 16:31:29 -07:00
Greg Sjaardema
26779a9e49 Add local include paths first
If a netcdf.h include file exists in any of the include paths
specified for HDF5 or other libraries, it was being included
instead of the local netcdf.h file in the source directory
since the local include paths were added at the end of the
compile line instead of at the beginning.

This commit puts the local include paths at the beginning
of the compile line
2015-11-16 07:51:17 -05:00
Greg Sjaardema
e1dc89c8f0 Revert "Add local include paths first"
This reverts commit 3fa48a8f9d.
2015-11-16 07:48:05 -05:00
Greg Sjaardema
3fa48a8f9d Add local include paths first
If a netcdf.h include file exists in any of the include paths
specified for HDF5 or other libraries, it was being included
instead of the local netcdf.h file in the source directory
since the local include paths were added at the end of the
compile line instead of at the beginning.

This commit puts the local include paths at the beginning
of the compile line
2015-11-11 15:07:01 -05:00
Ward Fisher
f2b8e69ea8 Corrected logic use of USE_PARALLEL for no-hdf5 but still using pnetcdf.
Added fix for github issue http://github.com/Unidata/netcdf-c/issues/143 as suggested by Wei-keng Liao.
2015-11-09 18:21:11 +00: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
1f52d14392 Reintroduced ENABLE_DOXYGEN_SERVER_BASED_SEARCH option for local webserver use. 2015-11-02 12:58:29 -07:00
Ward Fisher
9018649d9b Re-adding server-side search option. 2015-11-02 12:46:09 -07:00
Ward Fisher
4e9dd0c2fc Correctly updating CMakeLists.txt build method. 2015-10-29 19:56:04 +00:00
Ward Fisher
4e60400275 Changing some cmake infrastructure re: how tests are built. 2015-10-29 19:50:48 +00: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
519a56019f Merge branch 'fix-typos' of https://github.com/tbeu/netcdf-c into tbeu-fix-typos 2015-10-16 14:16:09 -06:00
Ward Fisher
65314a8ba2 Tweaked cmake header. 2015-10-14 11:08:54 -06:00
Ward Fisher
77d06c276a Added PARALLEL4 flag to CMakeLists. 2015-10-09 14:13:50 -06:00
Ward Fisher
ef586766e3 Added STDIO option to CMake-based build. 2015-10-09 13:06:32 -06:00
Ward Fisher
11b3012f82 Removed library version check for pnetcdf from cmake build, for the time being. 2015-10-09 10:34:08 -06:00
dmh
8fc86035b2 merge-squash 2015-10-09 10:22:00 -06:00
Ward Fisher
1890af1ffe Removed library version check for pnetcdf from cmake build, for the time being. 2015-10-09 10:14:45 -06:00
dmh
49597a64af merge-squash 2015-10-09 10:12:11 -06:00
Ward Fisher
ffa0a63a72 There were a few changes that needed to be made, and we needed to disable extra tests by default or 'make distcheck' fails, for now. Will investigate in more depth later. 2015-10-08 11:02:31 -06:00
tbeu
e2820e4d8a Fix common typos
Detected by https://github.com/vlajos/misspell_fixer
2015-08-20 11:42:05 +02:00