mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-12-09 08:11:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,806 Commits 91 Branches 75 Tags 86 MiB
d959512a2e
Commit Graph

589 Commits

Author SHA1 Message Date
Ward Fisher
d4a4dfdd15 Resolved a conflict. 2017-03-13 14:23:57 -06:00
Ward Fisher
8e3790f7ce Merged master. 2017-03-09 12:53:28 -07: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
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
f545023d0f More headache between discrepancies in CMake HDF5 variables. Updated to work on Windows as well as *nix. 2017-02-16 13:00:07 -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
2f9bc02f98 Added a check for endianness in CMake, the lack of which and fix for was contributed by Wei-Keng Liao 2017-02-06 12:23:55 -07:00
Ward Fisher
dd125a92ee Updated hdf5 variable in CmakeLists file. 2017-02-03 11:04:05 -07:00
Ward Fisher
3e5124996e Merged https://github.com/Unidata/netcdf-c/pull/319 to resolve some recently arisen conflicts, in preparation for larger merge. 2017-02-01 13:27:29 -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
Wei-keng Liao
4cdbf7dba5 Merge branch 'master' into issue258 2016-12-01 01:09:45 -06:00
Ward Fisher
becffaa784 Bumped SO version. 2016-11-21 10:25:30 -07:00
Wei-keng Liao
154b805dc4 check PnetCDF setting on erange-fill and adjust 2016-11-14 10:41:10 -06:00
Wei-keng Liao
e8cfdbb25a Merge branch 'master' into issue258 2016-11-13 00:00:54 -06:00
Wei-keng Liao
2081ae7099 add configure option --enable-relax-coord-bound for issue #243 2016-11-12 23:58:09 -06: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
Wei-keng Liao
5137be27d1 add configure/cmake option to disable erange_fill 2016-11-03 15:14:14 -05:00
Wei-keng Liao
7572e1cbbf add sizeof checks for unsigned data types 2016-10-28 18:16:49 -05: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
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
Ward Fisher
32d788fc7d Merge branch 'header_mod' 2015-08-17 16:00:42 -06:00
Ward Fisher
b26598c833 Merging Jen's new search option for releases into user documentation. 2015-08-17 10:59:32 -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
8f2bf0089e Some tweaks, trying to debug autotools-based build. 2015-07-28 12:38:52 -06:00
Ward Fisher
32100c77b1 Turned extra tests on by default. 2015-07-07 13:49:39 -06:00
Ward Fisher
dbd2be12ae Changed version to include 'development' signifier. This will be removed/changed when preparing releases. This way, there will never be a question about what is being worked on. 2015-06-19 12:29:15 -06:00
Ward Fisher
39c9d10ede Removed a stray debugging message. 2015-06-18 14:37:31 -06:00
Ward Fisher
952b73e51e Modified how m4 is detected/handled, made it less a straight platform check. 2015-06-11 14:28:39 -06:00
Ward Fisher
099b6eb05b Bumped version info. 2015-06-04 15:19:51 -06:00
Ward Fisher
76e85a9c76 Working on cleaning up the auth.md file. 2015-06-03 15:15:00 -06:00
Ward Fisher
64e0d2a44e Added a new test for h4 endianness. [NCF332] 2015-05-28 17:13:15 -06:00
Ward Fisher
99ef1624bc Regarding [NCF-331], the issues appears to have been in nc4file.c:get_type_info2(). The call to H5Tget_order() was only happening for H5T_Float. According to the documentation, this works for all datatypes as of hdf5 1.8.6. This tentatively fixes the bug reported, but additional testing (and cleanup from debugging) is needed. 2015-05-15 14:24:27 -06:00
Ward Fisher
999f4e5720 Additional debugging, modified the LOGGING functions somewhat. Also modified ncdump to print 'native' endianness. This may be removed before merging back into trunk. 2015-05-14 17:22:07 -06:00
Ward Fisher
6ca2170495 Modified how CMake builds detect szip. 2015-05-07 17:44:29 -06:00
Ward Fisher
cc6e6873eb Added an advanced cmake option, ENABLE_FAILING_TESTS, which will be used to manage tests that are known to fail, but for which failure is not expected/desired. This way we can occasionally check to see if other fixes/changes have fixed failures we're aware of. 2015-04-29 11:04:26 -06:00
Ward Fisher
d80300b565 Corrected logic error in buildname prefix/suffix. 2015-04-23 11:13:50 -06:00
Ward Fisher
b5ef92dc5f Added BUILDNAME_PREFIX and BUILDNAME_SUFFIX options to cmake build system, to make it easier to customize the build name displayed on the CDash dashboard. 2015-04-23 11:03:26 -06:00
Ward Fisher
23e4079480 Relocated a check for mremap so that MMAP support can be properly enabled via cmake. 2015-04-22 09:59:39 -06:00
Ward Fisher
218bd4a259 Corrected logic error. 2015-04-21 16:04:39 -06:00
Ward Fisher
4c07e22ae4 Progress working towards [NCF-329] 2015-04-21 13:52:43 -06:00
Ward Fisher
9fccf5de56 Bumped version number in preparation for the next release, 4.3.3.1 2015-02-25 10:48:12 -07:00
Ward Fisher
9c87a7466b Corrected a sloppy error on my part. 2015-02-23 15:58:30 -07:00
Ward Fisher
4b9230b4a9 Preparing for 4.3.3 release. 2015-02-12 13:16:54 -07:00
Ward Fisher
5b40f3a27e Added a platform check for hostname on Windows. Updated how 'diff' is called in a diskless test to ignore whitespace when comparing files. 2015-02-04 09:11:27 -07:00
Ward Fisher
444bf7a311 Cleaning up ctest site identification. 2015-02-02 15:14:22 -07:00
Ward Fisher
2d72b7ca7f More work on getting the shell scripts working properly with cmake under MSYS. 2015-02-02 14:46:50 -07:00
Ward Fisher
fe1b96cdd9 Updated CMakelists to remove debug, release subdirectories on Windows. Updating shell scripts to work with MSYS paths. 2015-02-02 14:46:50 -07:00
Ward Fisher
ee352cd622 Prepared documentation for upcoming release candidate. 2015-01-14 13:01:13 -07:00
Ward Fisher
6a0d7cc51a Added a sizeof check for void* 2015-01-12 12:13:26 -07:00
Ward Fisher
252be7549e Made m4 check with cmake linux/unix only. 2015-01-12 10:42:33 -07:00
Ward Fisher
77619e5c06 Added failure states if m4 utility is not detected. 2015-01-12 10:36:11 -07:00
Ward Fisher
3aa6c969e2 Added an explicit check for CURLOPT_CHUNK_BGN_FUNCTION, otherwise we break the build on systems with libcurl older than version 7.21.0 2014-12-27 22:59:06 -08:00
Ward Fisher
9c2fd8541b Added checks for Windows systems. 2014-12-15 10:56:14 -07: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
8de2a68a30 Renamed option used to enable fortran bootstrap behavior. Updated RELEASE_NOTES.md with information re: this new option. 2014-11-20 15:56:11 -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
aba5029ac0 Reorganized postinstall scripts. 2014-11-18 12:52:41 -07:00
Ward Fisher
7947e31f74 Further work on getting an install-fortran option working. Cmake only so far, and now works with static AND shared builds. 2014-11-18 10:50:19 -07:00
Ward Fisher
04b8640efe Updated configuration for automatically building netcdf fortran. 2014-11-18 10:50:19 -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
xantares
c59911a8e5 Fix ENABLE_RPC cmake option syntax 2014-10-31 16:53:06 +01:00
Ward Fisher
d9ae7dff7a Merge branch 'cmake-hdf5-variable-names' of https://github.com/nschloe/netcdf-c into nschloe-cmake-hdf5-variable-names 2014-10-15 15:24:37 -06:00
Ward Fisher
4b7349885a Merge branch 'link-what-you-use' of https://github.com/nschloe/netcdf-c into nschloe-link-what-you-use 2014-10-15 14:51:08 -06:00
Ward Fisher
7a13f2afc9 The call to h5cc (used to determine the hdf5 version) was not working properly on OSX or Ubuntu 14.04. Replaced with a similar call. Also modified the call to use h5pcc in the event we are on a parallel system. 2014-10-09 16:00:01 -06:00
Nico Schlömer
9d6431a040 tests are using HDF5 explicitly, so link against HDF5 2014-10-08 12:50:55 +02:00
Nico Schlömer
89bec1cd8b move macro defintions behind option settings 
This allows us to access HDF5 variables in the macros.
 2014-10-08 12:47:58 +02: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
Ward Fisher
780add18de Corrected a logic error in CMake-based system when building with server-based search. 2014-09-24 12:40:27 -06:00
Ward Fisher
4958670b0c Added a new .gitignore specific to include/. 
Added netcdf_meta.h to user documentation generated by doxygen.
 2014-09-18 15:05:08 -06:00
Ward Fisher
841729d2ec Removed explicit optimization for debug builds. 2014-09-17 10:39:24 -06:00
Ward Fisher
0d4b4e62ca Merge pull request #81 from opoplawski/rpath 
Drop extra setting of CMAKE_INSTALL_RPATH
 2014-09-12 15:14:25 -06:00
Ward Fisher
028d564344 Have finished with autotools-based netcdf_meta.h template. Need to redo cmake-based template to match behavior. 
Modified cmake to use the same netcdf_meta template as autotools.

Removed trace of old cmake template file.
 2014-09-11 12:32:55 -06:00
Ward Fisher
37928ea229 Added generated file for cmake-based builds. 2014-09-10 13:35:27 -06:00
Ward Fisher
206ebc514c Infrastructure for generating a meta header file dynamically at configure time. 2014-09-10 13:35:27 -06:00
Ward Fisher
bb8077af30 Working woards automatically-generated meta information file. 2014-09-10 13:35:27 -06:00
Ward Fisher
2ddb91205d Initial version of template header file. 2014-09-10 13:35:26 -06:00
Ward Fisher
33eb968864 Added a CMake option for use at release time. DOXYGEN_ENABLE_SERVER_SIDE_SEARCH turns on server side search in the doxygen documentation. This is off by default, but when on provides a much more powerful search than the default. 2014-09-03 12:52:10 -06:00
Ward Fisher
92d2789625 Updated the RELEASE NOTES, bumped to the next (possible) version, rc2. It's not for sure that there will be an RC2, however. 2014-08-29 12:24:16 -06:00
Ward Fisher
01f24a5189 Changed HDF4 test check from 'wget' to 'curl', to mirror 
change in test scripts.
 2014-08-28 17:10:19 -06:00
Orion Poplawski
063c1f6b55 Drop extra setting of CMAKE_INSTALL_RPATH 2014-08-27 10:02:59 -06:00
Nico Schlömer
cf1ef3e817 move export functionality towards the end of CMakeLists.txt 
This ensure that all referenced variables are actually defined.
 2014-08-21 19:09:18 +02:00
Nico Schlömer
89ab25b79c add cmake option FIND_SHARED_LIBS 
Defaults to ${BUILD_SHARED_LIBS} and lets the user decide if
static or shared versions of third-party libraries are
searched.

Only applied to HDF5 for now.
 2014-08-21 10:25:00 +02:00
Nico Schlömer
d2ee2dff31 remove old export functionality, move new in place 2014-08-21 10:11:30 +02:00
Ward Fisher
cf87b409fe Removed stray comment characters, updated autotools-based build to package cmake export file template. 2014-08-20 12:33:49 -06:00
Ward Fisher
3cb78c5036 Manually merging pull request https://github.com/Unidata/netcdf-c/pull/74 contributed by Nico Schlömer 2014-08-20 12:30:11 -06:00
Ward Fisher
24bc450a60 Reorganized some stuff in CMakeLists.txt 2014-08-12 16:34:11 -06:00
Ward Fisher
6c071be031 Corrected issues where functions were not available in Windows. Specifically strndup. Also accomodated an included needed for getcwd. 2014-08-07 17:03:27 -06:00
Ward Fisher
0ef220c9c7 Bumped required hdf5 version. 2014-07-23 14:26:15 -06:00
Nico Schlömer
c47d2ab9b7 make Doxygen a requirement if documentation is to be built 2014-07-16 10:25:27 +02:00
Ward Fisher
16e5aaa4ea Added stanza to cmake build system for CMAKE_MACOSX_RPATH. Bumped minimum cmake version required to 2.8.12 2014-07-15 10:50:58 -06:00
Ward Fisher
2846168082 Removed dangling option for enabling unused variable, parameter warnings. 2014-06-24 15:21:18 -06:00
Ward Fisher
20e1e1f2c7 Removed compiler flags to suppress unused variables warning. 2014-06-24 15:19:17 -06:00
Ward Fisher
fb759d2961 Fixed an issue when using netcdf to compile with pnetcdf support. 2014-06-23 13:55:39 -06:00
Ward Fisher
f12d0c044e Corrected a typo when setting a CMake variable. 2014-06-20 17:58:34 -06:00
Ward Fisher
f07108ec43 Changed several cmake-based messages to use WARNING instead of STATUS. Changed DOXYGEN_LATEX_OUTPUT to DOXYGEN_PDF_OUTPUT to reflect that the latex is processed into pdf as part of the build process. Flagged the ENABLE_DOXYGEN_PDF_OUTPUT option as Experimental. 2014-06-20 17:41:09 -06:00
Ward Fisher
45e41c79f9 Added infrastructure to have cmake-based builds automatically generate PDF documentation when using Doxygen. 2014-06-18 14:33:49 -06:00
Ward Fisher
7baaeecb12 A bit of whitespace cleanup, clarification of messages in CMake-based builds. 2014-06-18 13:46:22 -06:00
Ward Fisher
2bf032d7b3 Fixed installation location for libnetcdf.settings file. 2014-06-17 14:25:49 -06:00
Ward Fisher
628393c16e Fixed a simple syntax error to address https://github.com/Unidata/netcdf-c/issues/61 2014-06-12 15:37:21 -06: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
7ba232fb9d When creating the libnetcdf.settings file, CMake-based builds now include compiler and linker debug or release flags. 2014-06-03 10:47:01 -06:00
Ward Fisher
343c6fd6fd Continued to flesh out cmake support for libnetcdf.settings. Added 
a pair of functions which will return a yes/no depending on whether
or not a variable is defined.  By default, cmake uses TRUE/FALSE.
 2014-06-02 15:14:27 -06:00
Ward Fisher
7c663b7203 Roughed in skeleton of cmake support for libnetcdf.settings. 2014-06-02 14:03:42 -06:00
Ward Fisher
3ac11849af Removed absolute paths in doxygen documentation generation. Added new doxygen templates to the autotools-based builds. 2014-05-29 14:07:45 -06:00
Ward Fisher
94fda7630b Made template naming convention more uniform. 2014-05-29 13:23:24 -06:00
Ward Fisher
b65f8ee73d Merged pull request 'make better use of GNUInstallDirs' contributed by nschloe, https://github.com/Unidata/netcdf-c/pull/57 2014-05-21 15:15:56 -06:00
Ward Fisher
05aaa4b376 Renamed man4 directory to docs. 2014-05-21 14:40:39 -06:00
Ward Fisher
48a3aa5378 Removed redundant BUILD_DOCS CMake variable. 2014-05-21 14:13:23 -06:00
Ward Fisher
8d5eafd7fc Corrected CMAKE_SHARED_LINKER_FLAGS_DEBUG setting, replacing 'one' with 'ell', as reported by nschloe at https://github.com/Unidata/netcdf-c/issues/58 2014-05-20 15:31:08 -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
98820c1abd Remoted an unnecessary CMake variable. 2014-05-09 16:44:51 -06:00
Jarle Ladstein
0c686a3ec3 Missing version in netcdf-config-version.cmake + install exports to standard path + set netcdf_LIBRARIES 2014-05-09 13:41:56 +02:00
Ward Fisher
f0e3bc696f Made 'dynamic loading' the default, to match the default for hdf5. 2014-05-05 15:37:47 -06:00
Ward Fisher
9dc06b5ccc Bumped developer revision to 4.3.3-rc1, to avoid any confusion as to what version a change belongs to. 2014-04-23 16:00:49 -06:00
Ward Fisher
0c993c9990 Updated version strings in relevant documents. 2014-04-23 14:36:40 -06:00
Ward Fisher
c8fc9b4de1 Turned off DAP T_AUTH tests by default, until we are ready to re-enable them. 2014-04-23 11:17:03 -06:00
Ward Fisher
dd3e88e25d Merge branch 'master' into sub_doc 2014-04-21 16:16:21 -06:00
Ward Fisher
5a693d7326 Merged pull requestion from nschloe, #48. 2014-04-21 16:11:48 -06:00
Ward Fisher
2fd1195b82 Merge branch 'master' into sub_doc 
Conflicts:
	man4/CMakeLists.txt
 2014-04-21 14:19:55 -06:00