Commit Graph

44 Commits

Author SHA1 Message Date
Ward Fisher
5507d81523 Updated example file for OSX 2018-01-16 17:27:28 -07:00
Dennis Heimbigner
99fccab359 1. Keep up to date by merging master
2. Fixed plugin building (nc_test4/hdf5plugins)
   to be done properly by cmake and automake.
4. Duplicated part of the nc_test4 filter test code
   in examples/C

An incomplete and untested set of hooks exist
for OS-X in nc_test4/findplugins.in. They need testing.
2018-01-16 11:00:09 -07:00
Ward Fisher
69a418c27d Merge branch 'cmake-fix' of https://github.com/nehaljwani/netcdf-c into gh692 2018-01-02 13:24:13 -07:00
Ward Fisher
c42bbd0ea2 Removed old file, updated travis file to allow for tests to run in parallel. 2017-12-05 12:17:40 -07:00
Ward Fisher
cc2189293d Merging create_sample_files script into do_comps.sh, as cmake dependencies between scripts is proving a bit problematic. 2017-12-01 14:02:18 -07:00
Ward Fisher
4837b1382f Fixing for cmake parallel tests. 2017-12-01 14:01:07 -07:00
Nehal J Wani
03dd4e260f
Make certain tests conditional on dependencies
tst_h_rdc0 depends on ncdump_tst_netcdf4, which isn't build if HAVE_BASH
isn't true. But CMake errors out with:

-- Bash shell not found; disabling shell script tests.
CMake Error at CMakeLists.txt:1521 (SET_PROPERTY):
  SET_PROPERTY given TEST names that do not exist:

    tst_h_rdc0

There are also some tests which cdl_do_maps depends on, but it is
also not defined if HAVE_BASH isn't true. CMake errors out with:

CMake Error at examples/CDL/CMakeLists.txt:10 (SET_TESTS_PROPERTIES):
  SET_TESTS_PROPERTIES Can not find test to add properties to:
cdl_do_comps

This patch makes these tests conditional, making CMake happy.
2017-11-26 10:17:58 +05:30
Ward Fisher
394ee6a1e0 Corrected typo, more enhancements in CMakeLists.txt 2017-11-22 13:34:56 -07:00
Ward Fisher
1ccdf0219f Work towards parallel testing via cmake. 2017-11-22 12:10:58 -07:00
Ward Fisher
136a717d26 Getting tests to run in parallel under cmake 2017-11-22 11:37:00 -07:00
Ed Hartnett
812c2fd4d1 got make -j check working in ncdump and examples directories 2017-11-17 10:16:17 -07:00
Ward Fisher
5ef5ffc2bc Corrected an inconsistency between the documentation and the example. 2016-01-08 15:29:32 -07: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
tbeu
e2820e4d8a Fix common typos
Detected by https://github.com/vlajos/misspell_fixer
2015-08-20 11:42:05 +02:00
dmh
859f105005 merge-squash 2015-08-15 16:26:35 -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
44fae42214 Cleaned up indentation, white space in multiple CMakeLists.txt files. 2014-04-21 11:15:33 -06:00
Ward Fisher
33d3d06971 Added initial 'make dist', 'make distcheck' support to
CMake-based builds.
2013-06-03 16:42:04 +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
7a226dd3f1 Merging the win_netcdf branch into the trunk. 2012-09-27 22:50:41 +00:00
Ward Fisher
31cfdd5910 Added 'examples' directory to CMake 2012-08-28 22:31:07 +00:00
Ward Fisher
d1b159bfa1 Modified Makefile.am scripts to run tests when working with
Windows DLLs.
2012-05-23 20:27:34 +00:00
Ed Hartnett
922ed6a303 removed fortran and cxx 2011-08-15 11:13:48 +00:00
Ed Hartnett
9212be6606 took out fortran API, made some documentation changes 2011-08-11 17:54:34 +00:00
Ed Hartnett
2b2bcded42 removed cxx and cxx4, bumped version to 4.2, and fixed up documentation some 2011-08-10 18:00:32 +00:00
Dennis Heimbigner
53e8d22d24 Fixed NCF-104 2011-07-27 20:48:58 +00:00
Ed Hartnett
b377906536 beginning of conversion to doxygen 2011-07-11 16:04:49 +00:00
Ed Hartnett
ec91981a4a fixed mistake in f90 example 2011-06-03 09:52:56 +00:00
Ed Hartnett
be2813aa5c fixed parallel example to use appropriate parallel flag when opening file 2011-06-03 09:52:13 +00:00
Ed Hartnett
e2685a1475 changes to remove EXTERN_LDFLAG from build, also to fix netCDF-4 sync bug 2011-05-17 19:14:35 +00:00
Ed Hartnett
8d99e0b43a more changes for mingw/DLL builds 2011-05-11 19:51:11 +00:00
Ed Hartnett
2f4cf5382e took out ldflags in Makefile.am files 2011-05-11 17:09:12 +00:00
Ed Hartnett
29e8619787 simplified build system 2011-04-26 20:57:24 +00:00
Ed Hartnett
d0d5e7c8c3 changes to make make check work on dll builds (by turning off shell tests for dll builds) 2011-03-21 20:31:56 +00:00
Russ Rew
7db57da22a Fix group bug in cxx4, remove extraneous include from cxx4 examples. 2010-11-30 17:39:21 +00:00
Ed Hartnett
1d25a39a8f changed permissions of shell scripts so they would actually work. 2010-10-19 17:52:48 +00:00
Ed Hartnett
a658960034 added more valgrind testing 2010-10-13 22:53:25 +00:00
Ed Hartnett
2ce4c3e368 removed unneeded files from repository 2010-06-29 14:22:30 +00:00
Ed Hartnett
cbb36d7710 more changes to makefiles 2010-06-22 19:48:55 +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
f039f511c8 more changes to get distcheck working 2010-06-07 16:13:40 +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
92ccf1c5fa moved headers to include directory 2010-06-03 20:22:55 +00:00
Ed Hartnett
6e22b23b01 begin creating trunk subdir 2010-06-03 13:23:50 +00:00