Commit Graph

296 Commits

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