mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-17 16:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Corrected a few windows-related errors.

Browse Source
This commit is contained in:
Ward Fisher 2012-08-08 16:04:11 +00:00
parent 359eb6ba23
commit 8ef94646a1
5 changed files with 469 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -102,8 +102,7 @@ ENDIF ()
# Build NetCDF4
OPTION (ENABLE_NETCDF_4 "Enable NetCDF-4" ON)
OPTION (ENABLE_NETCDF4 "Enable NetCDF-4" ON)
IF(ENABLE_NETCDF_4 OR ENABLE_NETCDF4)
IF(ENABLE_NETCDF_4)
SET(USE_NETCDF4 ON CACHE BOOL "")
SET(ENABLE_NETCDF_4 ON CACHE BOOL "")
SET(ENABLE_NETCDF4 ON CACHE BOOL "")
@ -168,9 +167,11 @@ IF(ENABLE_PNETCDF)
SET(USE_PNETCDF ON CACHE BOOL "")
ENDIF()
SET(MATH "")
IF(NOT WIN32)
# FFIO insteaad of PosixIO
OPTION(USE_FFIO "If true, use ffio instead of posixio" OFF)
ENDIF()
# Enable Tests
OPTION (ENABLE_TESTS "Enable basic tests, run with 'make test'." ON)
@ -266,14 +267,15 @@ CHECK_FUNCTION_EXISTS(getrlimit HAVE_GETRLIMIT)
# Check for the math library so it can be explicitely linked.
FIND_LIBRARY(MATH NAMES math m libm)
MESSAGE(STATUS "Math library: ${MATH}")
IF(NOT MATH)
MESSAGE(FATAL_ERROR "Unable to find the math library.")
IF(NOT WIN32)
FIND_LIBRARY(MATH NAMES math m libm)
MESSAGE(STATUS "Math library: ${MATH}")
IF(NOT MATH)
MESSAGE(FATAL_ERROR "Unable to find the math library.")
ENDIF()
ENDIF()
# Create config.h file
configure_file("${NetCDF_SOURCE_DIR}/cmake_config.h.in"
"${NetCDF_BINARY_DIR}/config.h")

2
ncdump/CMakeLists.txt
View File

@ -8,7 +8,7 @@ SET(ncdump_FILES ncdump.c utils.c vardata.c dumplib.c indent.c nctime0.c )
SET(nccopy_FILES nccopy.c utils.c nciter.c chunkspec.c utils.c dimmap.c)
# Base tests
SET(ncDumpChecks rewrite-scalar ctest ctest64 tst_utf8)
SET(ncDumpChecks rewrite-scalar tst_utf8)
SET(ncDumpTests "")

15
ncdump/run_tests.sh
View File

@ -2,6 +2,21 @@
# This shell script runs the ncdump tests.
# $Id: run_tests.sh,v 1.18 2010/05/19 13:43:39 ed Exp $
srcdir=`dirname $0`
cd $srcdir
srcdir=`pwd`
# compute the build directory
builddir=`pwd`/..
# Hack for CYGWIN
cd $srcdir
if [ `uname | cut -d "_" -f 1` = "MINGW32" ]; then
srcdir=`pwd | sed 's/\/c\//c:\//g'`
builddir="$srcdir"/..
fi
set -e
echo ""
echo "*** Testing ncgen and ncdump using some test CDL files."

880
ncgen3/ncgentab.c
View File

File diff suppressed because it is too large Load Diff

31
ncgen3/ncgentab.h
View File

@ -1,8 +1,9 @@
/* A Bison parser, made by GNU Bison 2.6.2. */
/* A Bison parser, made by GNU Bison 2.4.2. */
/* Bison interface for Yacc-like parsers in C
/* Skeleton interface for Bison's Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -30,15 +31,6 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
#ifndef NCG_NCGEN_TAB_H
# define NCG_NCGEN_TAB_H
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
#endif
#if YYDEBUG
extern int ncgdebug;
#endif
/* Tokens. */
#ifndef YYTOKENTYPE
@ -70,6 +62,7 @@ extern int ncgdebug;
#endif
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
@ -79,18 +72,4 @@ typedef int YYSTYPE;
extern YYSTYPE ncglval;
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int ncgparse (void *YYPARSE_PARAM);
#else
int ncgparse ();
#endif
#else /* ! YYPARSE_PARAM */
#if defined __STDC__ || defined __cplusplus
int ncgparse (void);
#else
int ncgparse ();
#endif
#endif /* ! YYPARSE_PARAM */
#endif /* !NCG_NCGEN_TAB_H */