Skip to content

Commit

Permalink
turning on --enable-fortran in DISTCHECK_CONFIGURE_FLAGS for travis
Browse files Browse the repository at this point in the history
  • Loading branch information
edhartnett committed Mar 26, 2019
1 parent 956f28f commit 58fccb6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ script:
- autoreconf -i
- export CFLAGS='-std=c99 -fsanitize=address -fno-omit-frame-pointer'
- export FFLAGS='-fsanitize=address -fno-omit-frame-pointer'
- export DISTCHECK_CONFIGURE_FLAGS='--enable-fortran'
- ./configure --enable-fortran
- make -j distcheck
- rm -rf build
Expand Down
5 changes: 2 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ AC_ARG_ENABLE([pnetcdf],
[Disable pnetcdf use.])])
test "x$enable_pnetcdf" = xno || enable_pnetcdf=yes
AC_MSG_RESULT([$enable_pnetcdf])
if test "x$enable_logging" = xyes; then
AC_DEFINE([PIO_ENABLE_LOGGING], 1, [If true, turn on logging.])
fi
AM_CONDITIONAL(BUILD_PNETCDF, [test "x$enable_pnetcdf" = xyes])

# NetCDF (at least classic) is required for PIO to build.
AC_DEFINE([_NETCDF], [1], [netCDF classic library available])
Expand Down Expand Up @@ -110,6 +108,7 @@ AC_MSG_RESULT([${have_netcdf_par}])
if test x$have_netcdf_par = xyes; then
AC_DEFINE([_NETCDF4],[1],[Does netCDF library provide netCDF-4 with parallel access])
fi
AM_CONDITIONAL(BUILD_NETCDF4, [test "x$have_netcdf_par" = xyes])

# Not working for some reason, so I will just set it...
AC_CHECK_TYPE([MPI_Offset], [], [], [#include <mpi.h>])
Expand Down
5 changes: 3 additions & 2 deletions set_flags.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#

# Set the CPPFLAGS.
AM_CPPFLAGS = -I$(top_srcdir)/src/flib
AM_CPPFLAGS += "-D_NETCDF -D_NETCDF4 -D_PETCDF"
AM_CPPFLAGS = -I$(top_srcdir)/src/flib -D_NETCDF

AM_CPPFLAGS += -D_PETCDF
AM_CPPFLAGS += -D_NETCDF4

0 comments on commit 58fccb6

Please sign in to comment.