Commit Graph

394 Commits

Author SHA1 Message Date
Dennis Heimbigner
c583f91992 merge with trunk and fix conflicts 2013-05-10 17:04:28 +00:00
Ward Fisher
df9a54b689 o Fixed the SOVERSION for CMake-based builds.
o Updated autotools-based build to include files required for CMake-based 
builds.

o Updated Markdown-based documentation processed by Doxygen to include a
CMake FAQ.
2013-05-08 21:59:11 +00:00
Ward Fisher
2d0dbcfa1d Merged latest from CMake branche.
Fixed an error on very small files (< 4 bytes) that was only occuring on sol. Updated CMake configuration file.
2013-05-01 23:55:24 +00:00
Ward Fisher
7d8bee2320 Updated version number to 4.3.0 2013-04-29 20:23:42 +00:00
Ward Fisher
10807379c3 Merging from CMake branch in preparation for 4.3.0 release. 2013-04-29 20:15:57 +00:00
Ward Fisher
4a274b9870 Merged latest changes from cmake development branch.
Addressed a number of memory-related problems
reported by Coverity.
2013-04-02 22:09:31 +00:00
Ward Fisher
b4bc5bfe24 Incorporating changes in preparation for
releasing 4.3.0RC4.
2013-03-27 19:19:10 +00:00
Ward Fisher
57fa9b3d5f Merged latest changes from netcdf-cmake branch.
Includes a few windows fixes, plus the skeleton
for 'make dist' and 'make distcheck' support
in cmake-based builds.
2013-03-27 19:15:00 +00:00
Ward Fisher
9f187a1484 Merged the fix for NCF-29 from Quincy into the trunk. 2013-03-26 18:57:26 +00:00
Dennis Heimbigner
c659633d2e merge from trunk 2013-03-26 16:45:02 +00:00
Ward Fisher
6e5e794e89 Merged latest changes from netcdf-cmake branch in preparation for next release candidate (4.3.0 rc4). 2013-03-25 20:28:40 +00:00
Ward Fisher
f26a4a559a Merged latest from netcdf-cmake branch.
Addressed several cmake-related issues, in terms of
building on Windows.  Also added XGetopt.c to 
EXTRA_dist in Makefile.am files.
2013-03-19 22:40:15 +00:00
Dennis Heimbigner
dea3c726c8 merge trunk into this branch 2013-03-15 20:31:07 +00:00
Ward Fisher
239a8e3c56 Neglected to update the version number in the build chains. 2013-03-11 21:21:20 +00:00
Ward Fisher
03fb6a2ac2 Merging latest changes from netcdf-cmake branch. 2013-03-11 21:13:51 +00:00
Ward Fisher
1ca3153d96 Merged changes from netcdf-cmake branch. 2013-03-08 23:36:40 +00:00
Ward Fisher
ca40a29fb1 Changed fsync to 'off' by default, based on conversation
with Russ, stemming from a discussion on netcdfgroup
related to slow responses from filesystems when fsync
is enabled.
2013-03-05 20:29:49 +00:00
Ward Fisher
abb8364f95 Fixed issue with linked libraries losing RPATH during installation. 2013-02-26 22:11:09 +00:00
Ward Fisher
0140ae8e71 Merge with latest cmake branch.
Added check for HAVE_STDINT_H in utf8proc.h,
to accomodate older visual studio versions
that require pnetcdf.h.
2013-02-26 17:54:41 +00:00
Ward Fisher
ba6bcca272 Updated files to next rc (4.3.0rc2) 2013-02-22 21:03:02 +00:00
Ward Fisher
12b7ac7048 o Improved package_source support in CMake-based builds.
o Corrected an issue related to uninitialized variables
which caused test failures on 2 test systems under
very specific circumstances.
2013-02-19 23:29:41 +00:00
Ward Fisher
1e4b930ad6 Updated version for 4.3.0 rc1 2013-02-19 17:35:21 +00:00
Ward Fisher
9ad4383ff8 Merged final changes against netcdf-cmake branch in preparation for
4.3.0-rc1
2013-02-19 17:13:24 +00:00
Ward Fisher
49b144143d CMake fixes for enabling MMAP tests. 2013-02-14 20:24:02 +00:00
Ward Fisher
51848614c3 Corrected parallel support in CMake, including
library checks and parallel IO tests.  Updated 
CMake-related documentation.
2013-02-12 22:22:54 +00:00
Ward Fisher
8d6bfcd534 Added new tests to CMake test system. 2013-02-06 23:09:19 +00:00
Ward Fisher
e8053ad518 Corrected CMake behavior in doxygen.
Updated documentation to reflect location of
CMake-related Documentation for netCDF-C.
2013-01-30 21:13:32 +00:00
Ward Fisher
19dcece866 Merged latest trunk, addressed NC_MAX_DIMS dependence in libsrc4 2013-01-28 18:31:02 +00:00
Ward Fisher
ede56bae41 Corrected a couple of issues related to DAP tests, based on feedback from users. 2013-01-25 17:51:33 +00:00
Ward Fisher
23647a6910 2013-01-22 20:37:23 +00:00
Ward Fisher
91188cea7a Merging CMake branch into trunk. Changes include:
CMake related changes in CMakeLists.txt files,
cmake_config.h.in. Other changes relate to 
Windows-specific issues, and changes made
when regenerating generated source files.
2013-01-15 22:43:09 +00:00
Ward Fisher
21523c8582 Merged changes from cmake branch. oc2 changes are just
'file property' changes, not sure what exactly.
2012-12-20 21:50:45 +00:00
Ward Fisher
7b91248723 Merged changes from netcdf-branch.
o Changed variable names 'typeid' to 'typeid1' to avoid a namespace conflict
in visual studio.
o Cleaned up a handful of warnings in Visual Studio.
o Addressed a few Coverity-discovered issuesl
o Made changes to CMake-based builds.
2012-12-13 22:09:41 +00:00
Ward Fisher
81280c7878 Merge from latest netcdf-cmake branch.
- Fixes for Windows.
- CMake-based changes (functionality, tests).
- Smattering of coverity-informed bug-fixes.
2012-12-05 18:35:42 +00:00
Ward Fisher
ff631c8156 Merged latest changes from cmake branch.
o Improved CMake support.
o Cmake module compatibility (netcdf-config*.cmake.in).
2012-11-19 21:43:12 +00:00
Ward Fisher
9f443e01cf Refactored how HDF5 is searched for. 2012-11-09 22:45:33 +00:00
Ward Fisher
9b751ac7af Modified method for locating szip.lib 2012-11-09 21:19:17 +00:00
Ward Fisher
c127c03923 2012-11-07 17:35:35 +00:00
Ward Fisher
f4dea1a337 2012-11-07 17:34:05 +00:00
Ward Fisher
a3341e1987 2012-11-07 17:30:12 +00:00
Ward Fisher
cc25ae9c4b 2012-11-05 22:52:14 +00:00
Ward Fisher
9c8c3b468a 2012-11-05 22:44:01 +00:00
Ward Fisher
1aa9a95cbb Added new option to allow for custom library names. 2012-10-31 22:17:33 +00:00
Ward Fisher
e427d52e1b Removing pkgconfig support for now. 2012-10-30 17:11:51 +00:00
Ward Fisher
c43bc9957a Initial stab at pkgconfig support. Not complete. 2012-10-29 18:46:56 +00:00
Ward Fisher
db4a3160ef 2012-10-26 21:41:07 +00:00
Ward Fisher
28741e1761 2012-10-24 19:49:31 +00:00
Ward Fisher
45d035d587 Changed some options 2012-10-15 21:58:13 +00:00
Ward Fisher
1f61eefdcc Removed CDash info from the CMakeLists.txt file. 2012-10-11 22:42:53 +00:00
Ward Fisher
30c2bfac83 Added files to support an 'uninstall' target. 2012-10-11 22:31:50 +00:00
Ward Fisher
448a95d74d 2012-10-09 20:56:27 +00:00
Ward Fisher
4072bb97a1 A few CMake-related changes. 2012-10-09 16:42:09 +00:00
Ward Fisher
d24422c126 Modified CMake configuration to fix some problems present on 64-bit linux. 2012-10-03 20:47:34 +00:00
Ward Fisher
51ff4c0ec6 2012-10-03 17:44:54 +00:00
Ward Fisher
faf8e03d62 Corrected a CPack issue, so that dependencies are included. 2012-10-03 17:13:19 +00:00
Ward Fisher
8e6a7cb056 Fixed error building shared libs on 64-bit linux. 2012-10-03 16:39:27 +00:00
Ward Fisher
5f4286b6a2 2012-10-02 20:56:46 +00:00
Ward Fisher
3243ccad1f A few changes to cmake tests. 2012-10-02 20:30:25 +00:00
Ward Fisher
7a226dd3f1 Merging the win_netcdf branch into the trunk. 2012-09-27 22:50:41 +00:00
Ward Fisher
dfed98c691 Add code to generate an export library. 2012-09-24 21:31:59 +00:00
Ward Fisher
5259123089 2012-09-24 20:48:12 +00:00
Ward Fisher
bcf0bfc96d 2012-09-21 20:51:31 +00:00
Ward Fisher
0d221a4e20 2012-09-20 21:18:20 +00:00
Ward Fisher
91d8839443 Cleaning up some detritus in the CMakeLists.txt file. 2012-09-18 15:29:59 +00:00
Ward Fisher
59af056da6 2012-09-14 16:15:18 +00:00
Ward Fisher
a1fda0f885 2012-09-13 22:07:35 +00:00
Ward Fisher
7b801fb6db 2012-09-13 20:50:57 +00:00
Ward Fisher
347a883081 2012-09-13 20:41:54 +00:00
Ward Fisher
2de3388cf1 Additional CMake usage. 2012-09-13 18:27:23 +00:00
Ward Fisher
a83c1bd851 2012-09-12 20:18:48 +00:00
Ward Fisher
a900a4a399 2012-09-11 20:17:24 +00:00
Ward Fisher
d6c7112481 2012-09-11 19:53:47 +00:00
Ward Fisher
c802a16c06 2012-09-07 16:38:03 +00:00
Ward Fisher
54a3c8290a 2012-09-07 16:34:23 +00:00
Ward Fisher
9102a07a8b 2012-09-07 16:12:50 +00:00
Ward Fisher
e797d3ed50 2012-09-06 22:59:45 +00:00
Ward Fisher
7d2a113912 2012-09-06 22:48:22 +00:00
Ward Fisher
0223143eb1 2012-09-04 21:12:17 +00:00
Ward Fisher
7736efcc62 2012-09-04 20:46:45 +00:00
Ward Fisher
74458ec912 2012-09-04 19:52:48 +00:00
Ward Fisher
5f3dfc5024 Updated check for Curl libraries. 2012-09-04 17:05:53 +00:00
Ward Fisher
9d4199fa74 2012-08-30 16:22:03 +00:00
Ward Fisher
3563643a32 2012-08-29 22:33:25 +00:00
Ward Fisher
333b7cfc86 2012-08-29 22:05:33 +00:00
Ward Fisher
c6019b7e94 2012-08-29 22:04:31 +00:00
Ward Fisher
b81dc4373d Changed how HDF5 is located. 2012-08-29 21:33:28 +00:00
Ward Fisher
4a598ea5e5 Corrected a path error when building a source package. 2012-08-29 19:46:19 +00:00
Ward Fisher
15231a8a66 2012-08-29 19:09:00 +00:00
Ward Fisher
e62a487fd1 2012-08-29 19:07:36 +00:00
Ward Fisher
9e8cfcf808 Additional CMake support, CPack support. 2012-08-29 18:58:08 +00:00
Ward Fisher
31cfdd5910 Added 'examples' directory to CMake 2012-08-28 22:31:07 +00:00
Ward Fisher
6d6542a85a Corrected a macro error. 2012-08-28 19:38:32 +00:00
Ward Fisher
04e61d5894 Added MSVC-compatibility items. 2012-08-27 21:19:25 +00:00
Ward Fisher
643a80f178 Excluded tests when building using Visual Studio. 2012-08-27 18:57:18 +00:00
Ward Fisher
3b76a69484 Began building exclusions list for source package redistribution. 2012-08-24 21:01:07 +00:00
Ward Fisher
7ef113df5f 2012-08-24 18:24:58 +00:00
Ward Fisher
58035ff8f2 Added new tests, CMake functionality. 2012-08-21 20:08:53 +00:00
Ward Fisher
8f9120e3a9 Modified to work on Windows 2012-08-20 22:49:53 +00:00
Ward Fisher
6da7859b0b Added changes related to documentation generation. 2012-08-17 21:37:40 +00:00
Ward Fisher
61c0ca0bbd Corrected a few tests 2012-08-16 22:51:45 +00:00
Ward Fisher
c8febf92ed Modified related to m4 file conversion macro. 2012-08-13 16:10:36 +00:00
Ward Fisher
ba9924421c 2012-08-13 15:43:49 +00:00
Ward Fisher
23a731a558 2012-08-13 15:41:35 +00:00
Ward Fisher
c779849f27 Undoing a change to how linked files are computed. 2012-08-10 23:06:10 +00:00
Ward Fisher
41bb7c892d 2012-08-10 22:59:40 +00:00
Ward Fisher
94da991824 2012-08-10 21:45:06 +00:00
Ward Fisher
9b3d24cbc0 2012-08-10 21:44:00 +00:00
Ward Fisher
5e9d4000e1 Added additional tests in CMake 2012-08-10 20:55:07 +00:00
Ward Fisher
85f6c4cc08 Additional changes in support of CMake, CTest 2012-08-09 22:54:19 +00:00
Ward Fisher
14619ec4c4 2012-08-09 18:40:41 +00:00
Ward Fisher
5e16f2c80c 2012-08-09 16:39:13 +00:00
Ward Fisher
db32d50664 2012-08-09 16:06:02 +00:00
Ward Fisher
eb238ae3e2 2012-08-08 22:46:28 +00:00
Ward Fisher
05cde40552 2012-08-08 22:31:28 +00:00
Ward Fisher
77bd943296 2012-08-08 17:24:32 +00:00
Ward Fisher
8ef94646a1 Corrected a few windows-related errors. 2012-08-08 16:04:11 +00:00
Ward Fisher
db0f2425db Added additional tests 2012-08-07 22:42:42 +00:00
Ward Fisher
0a964ad8b1 Updated CMake files, added a few changes to fix linux-based compile warnings. 2012-08-07 21:34:55 +00:00
Ward Fisher
0ee2fba307 Expanded ctest functionality. 2012-08-07 20:21:44 +00:00
Ward Fisher
02828e917a Integrated more tests, added additional CMake functionality 2012-08-06 23:07:40 +00:00
Ward Fisher
e2293a4368 Begin integrating CTest and CDash functionality. 2012-08-06 20:53:34 +00:00
Ward Fisher
cf634c0cc8 2012-08-06 17:23:23 +00:00
Ward Fisher
64365a8ad7 CMake-related updated. 2012-08-06 16:57:29 +00:00
Ward Fisher
751c41928a Additional CMake changes. 2012-08-03 22:24:29 +00:00
Ward Fisher
0d90326575 Integrated latest changes to trunk, added preliminary CPack support. 2012-08-02 22:56:57 +00:00
Ward Fisher
1af2b768b0 Merged changes from trunk (mainly Dennis' oc2 inclusion). 2012-07-31 22:04:25 +00:00
Ward Fisher
adfd7579de Additional CMake files 2012-07-25 22:09:19 +00:00
Ward Fisher
dfdad6adf7 Additional CMake support changes. 2012-07-24 22:53:58 +00:00
Ward Fisher
9726e2d283 2012-07-23 20:09:26 +00:00
Ward Fisher
bf423da6bf CMake-related tests. 2012-07-23 19:40:08 +00:00
Ward Fisher
31ea8ffaa5 CMake Changes 2012-07-20 21:16:27 +00:00
Ward Fisher
676c696173 More CMake-related changes. 2012-07-20 17:53:53 +00:00
Ward Fisher
899b22a31c 2012-07-20 17:45:06 +00:00
Ward Fisher
111ea759e1 CMake Integration 2012-07-19 22:30:05 +00:00
Ward Fisher
4af02f4c75 CMake support changed 2012-07-19 22:11:10 +00:00
Ward Fisher
b9a8bd4bc3 2012-07-19 17:25:24 +00:00
Ward Fisher
71075cee2e Additional changes in support of CMake. 2012-07-18 21:12:58 +00:00
Ward Fisher
d66293beca More changes in support of CMake support 2012-07-17 21:44:41 +00:00
Ward Fisher
b1faefede0 More changes related to CMake support. 2012-07-17 20:50:43 +00:00
Ward Fisher
2dc39563cc Changes in suport of CMake 2012-07-16 22:31:35 +00:00
Ward Fisher
ec4b3dd141 2012-07-13 16:49:20 +00:00
Ward Fisher
98ded522ec Additional updates for CMake support. 2012-07-10 17:58:53 +00:00
Ward Fisher
381529f81e o Additional work with CMake
o Added config.h for CMake
2012-07-10 17:41:05 +00:00
Ward Fisher
75a48b9e9e Integrated changes from trunk, began adding CMake support, updated 'build everything' script. 2012-07-02 22:59:59 +00:00