mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-24 16:04:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,656 Commits 90 Branches 75 Tags 90 MiB
5871f3ad0c
Commit Graph

426 Commits

Author SHA1 Message Date
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