Commit Graph

61 Commits

Author SHA1 Message Date
Ward Fisher
64e0d2a44e Added a new test for h4 endianness. [NCF332] 2015-05-28 17:13:15 -06: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
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
a4724f7aee Initial attempt at getting netcdf-c to automatically build and install netcdf-fortran. 2014-11-18 10:50:19 -07:00
Ward Fisher
a90c9829a2 Corrected issue where libraries were being linked against multiple times. 2014-11-03 10:43:43 -07: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
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
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