Commit Graph

192 Commits

Author SHA1 Message Date
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
Nico Schlömer
847cbf66dc fix link bug for static builds 2014-08-21 12:03:41 +02:00
Nico Schlömer
d2ee2dff31 remove old export functionality, move new in place 2014-08-21 10:11:30 +02: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
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
5a693d7326 Merged pull requestion from nschloe, #48. 2014-04-21 16:11:48 -06:00
Ward Fisher
733f6257b0 Updating cmake shared_linker_flags as suggested by Nico Schlomer: https://github.com/Unidata/netcdf-c/issues/46
Fixed indentation.

Updated .gitignore.

Added a macro to make it easy to check to see if the linker supports a particular flag.  Debug builds now pass the -w1,--no-undefined if it is detected the linker supports it.
2014-04-02 15:54:05 -06:00
dmh
af566dd300 In preparation for adding dap4 support, I have cleaned up
the libdap2 code to make it dap2 protocol + netcdf classic
only.
2014-03-24 14:02:52 -06:00
Ward Fisher
154c2a6edf Stopped tracking a cmake-specific pkgconfig template; using the same one as autotools. Tightened up cmake summary a little, now a pkg-config file is generated. 2014-02-06 16:17:30 -07:00
Ward Fisher
8b368d0c3b Corrected a CMake error on Linux. 2013-10-07 12:58:38 -06:00
Ward Fisher
1cb69fb402 Corrected an issue on Windows 2013-10-07 12:39:54 -06:00
Ward Fisher
c8baf5c0e3 Updating how Windows tracks HDF5 libraries to link against. 2013-10-07 11:14:24 -06:00
Ward Fisher
09d4854165 Corrected a CMake issue which appeared to happen between two different versions of OSX. 2013-10-07 10:18:44 -06:00
Ward Fisher
c61b058807 Updated CMakeLists.txt to only link against the HDF5_hdf5 and HDF5_hdf5_hl libraries. 2013-10-04 17:07:10 -06:00
Orion Poplawski
392d6bcbf6 Use GNUInstallDirs to install into /usr/lib64 as needed 2013-08-13 10:00:22 -06:00
Ward Fisher
b4e198d163 Added '--enable-dynamic-loading' to autotools-based builds, and
-DENABLE_DYNAMIC_LOADING to cmake-based builds.

This will allow for compatibility with hdf5 1.8.11 builds that
have enabled dynamic building (depends on libdl).

See Jira ticket NCF-258
2013-06-10 21:48:11 +00:00
Ward Fisher
33d3d06971 Added initial 'make dist', 'make distcheck' support to
CMake-based builds.
2013-06-03 16:42:04 +00:00
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
Dennis Heimbigner
dea3c726c8 merge trunk into this branch 2013-03-15 20:31:07 +00:00
Ward Fisher
ddf3c31bb0 Corrected a handful of syntax issues in CMake config files,
probably introduced more.  

Added CMake-related files to Makefile.am files for inclusion
when creating a distribution package.
2013-02-20 23:28:28 +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
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
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
ef140d0df7 Corrected an issue with custom .dll names. 2012-10-31 22:30:10 +00:00
Ward Fisher
1aa9a95cbb Added new option to allow for custom library names. 2012-10-31 22:17:33 +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
8e6a7cb056 Fixed error building shared libs on 64-bit linux. 2012-10-03 16:39:27 +00:00
Ward Fisher
7f8b10503c 2012-10-03 15:56:44 +00:00
Ward Fisher
44b519cf82 2012-10-03 15:51:31 +00:00
Ward Fisher
d6dd554ff4 2012-10-02 22:56:12 +00:00
Ward Fisher
dfed98c691 Add code to generate an export library. 2012-09-24 21:31:59 +00:00
Ward Fisher
0d221a4e20 2012-09-20 21:18:20 +00:00
Ward Fisher
a1fda0f885 2012-09-13 22:07:35 +00:00
Ward Fisher
2de3388cf1 Additional CMake usage. 2012-09-13 18:27:23 +00:00
Ward Fisher
b81dc4373d Changed how HDF5 is located. 2012-08-29 21:33:28 +00:00
Ward Fisher
9e8cfcf808 Additional CMake support, CPack support. 2012-08-29 18:58:08 +00:00
Ward Fisher
8f9120e3a9 Modified to work on Windows 2012-08-20 22:49:53 +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
14619ec4c4 2012-08-09 18:40:41 +00:00
Ward Fisher
0607b62375 Added coverage test flags to CMakeLists.txt files. 2012-08-09 17:07:41 +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
ac05a19ef8 Updated for advanced CMake functionality. 2012-08-06 17:27:08 +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
Dennis Heimbigner
42999f4c7c move from oc1.0 to oc2.0; create new dir oc2 2012-07-31 20:34:13 +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
31ea8ffaa5 CMake Changes 2012-07-20 21:16:27 +00:00
Ward Fisher
4af02f4c75 CMake support changed 2012-07-19 22:11:10 +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
Dennis Heimbigner
aebd11348a 1)Integrate the oc with improved performance 2012-01-29 18:56:29 +00:00
Russ Rew
6371346c7c Use -version-info rather than -version-number for generating libtool soname in liblib/Makefile.am 2012-01-13 20:51:12 +00:00
Russ Rew
e39dc1ed39 Revert libtool version to 7.1.1. Disable libdiskless. 2012-01-12 23:27:30 +00:00
Russ Rew
79fd41f158 Changed libtools version info to use 8.0.2 instead of 7.1.1, due to new NC_DISKLESS flag constant for nc_create() call 2011-12-28 19:21:47 +00:00
Ed Hartnett
d18f5e2cc8 took out evil fortran hack 2011-10-04 19:21:57 +00:00
Ed Hartnett
66ac7a9121 had to add copy of fortran files 2011-09-29 14:07:01 +00:00
Ed Hartnett
6f634d8b06 had to add copy of fortran files 2011-09-29 14:02:22 +00:00
Ed Hartnett
eb0c730452 added hack to allow F77 library to be built into the C library 2011-09-29 13:44:21 +00:00
Ed Hartnett
4def09a1b0 added hack to allow F77 library to be built into the C library 2011-09-29 13:43:53 +00:00
Dennis Heimbigner
1578ddac0c 2011-09-20 20:39:04 +00:00
Dennis Heimbigner
12d4f46668 2011-09-18 20:57:51 +00:00
Ed Hartnett
fde5e75730 removed diskless files for non-netcdf-4 builds 2011-08-23 15:07:24 +00:00
Ed Hartnett
d58c18c623 added diskless files API, subsetting not working, classic model only 2011-08-16 21:04:33 +00:00
Ed Hartnett
a598103bad cleaned up makefiles, incremented libtool version-number for C library 2011-06-07 12:08:16 +00:00
Ed Hartnett
29e8619787 simplified build system 2011-04-26 20:57:24 +00:00
Dennis Heimbigner
c04d65e1d3 2011-04-17 18:50:10 +00:00
Dennis Heimbigner
0b477e29cc rebuilt dap constraints 2011-04-16 20:56:36 +00:00
Ed Hartnett
8eb9a74016 many changes to get clean DLL builds in mingw for fortran, cxx, cxx4, and v2 2011-03-21 18:38:10 +00:00
Ed Hartnett
965a3aac70 minor refactor of the build system to work better for cross-compiling 2011-03-15 10:19:08 +00:00
Ed Hartnett
b9358f5890 updated (and fixed) shared library version numbers for all netcdf libraries 2011-02-17 12:58:08 +00:00
Ed Hartnett
1a3ba4a6d8 cywin-mingw32 dlls now building 2011-01-06 20:12:06 +00:00
Dennis Heimbigner
f7e41dde66 add cdmremote skeleton code 2010-12-15 21:45:05 +00:00
Dennis Heimbigner
cba787cfff Fixed bug in libcndap about handling nested sequences 2010-12-03 22:01:21 +00:00
Dennis Heimbigner
b2c05fa4d0 fixed:
ncgen: nan bug
       made semicolons optional after type decls
libncdap{3,4}: revamped the NC surrogate to better match
       with libsrc
libdispatch: Added a new_nc function to the dispatch table; its purpose
                 is to allow hierarchical use of NC compatible data structures.
libsrc: cleaned up the NC structure by removing drno field
general: removed --with-oc options
2010-11-09 22:53:03 +00:00
Dennis Heimbigner
5afdfaf92e fix multiple definitions error 2010-08-06 19:59:14 +00:00
Dennis Heimbigner
dd4fe6d25c dispatch.h->ncdispatch.h to avoid visualstudio filename conflict 2010-08-05 02:44:59 +00:00
Dennis Heimbigner
c5cb1104b7 removed USE_DISPATCH and most uses of nc3 from libsrc4 2010-07-30 19:20:22 +00:00
Ed Hartnett
fc4a4ea189 finished breaking up netcdf.m4 into c files. 2010-06-22 13:25:14 +00:00
Ed Hartnett
bb57cf2e4b moved functions out of m4 into c files in libdispatch/netcdf.m4 2010-06-18 14:01:51 +00:00
Ed Hartnett
1e87ea9cbd fixed shared build problems 2010-06-09 16:01:32 +00:00
Ed Hartnett
bb0035c95d fixed Makefile.am includes to find new netcdf.h location 2010-06-07 15:40:31 +00:00
Ed Hartnett
7afbaa4b52 merged trunk up to revision 75, move v2 API 2010-06-07 11:12:14 +00:00
Ed Hartnett
92ccf1c5fa moved headers to include directory 2010-06-03 20:22:55 +00:00
Ed Hartnett
18f4bca367 moving to trunk subdir 2010-06-03 13:24:43 +00:00