Skip to content

Commit

Permalink
Merge pull request ESMCI#1718 from NCAR/ejh_next_3
Browse files Browse the repository at this point in the history
removed unused define, clarified build summary, cleaned up some aspects of travis build
  • Loading branch information
edwardhartnett authored Aug 15, 2020
2 parents 084f1c1 + 4430bcd commit c99eb28
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ before_script:
- export CC=mpicc
- export FC=mpif90
- export CPPFLAGS='-I/usr/include'
- wget https://parallel-netcdf.github.io/Release/pnetcdf-1.12.1.tar.gz
- tar -xzvf pnetcdf-1.12.1.tar.gz
- wget https://parallel-netcdf.github.io/Release/pnetcdf-1.12.1.tar.gz &> /dev/null
- tar -xzf pnetcdf-1.12.1.tar.gz
- pushd pnetcdf-1.12.1
- ./configure --prefix=/usr --enable-shared --disable-cxx
- make
Expand All @@ -41,9 +41,9 @@ env:
script:
- nc-config --all
- autoreconf -i
- export CFLAGS='-std=c99 -fsanitize=address -fno-omit-frame-pointer -Werror'
- export FFLAGS='-fsanitize=address -fno-omit-frame-pointer'
- export FCFLAGS='-fsanitize=address -fno-omit-frame-pointer -Werror'
- export CFLAGS='-g -std=c99 -fsanitize=address -fno-omit-frame-pointer -Werror'
- export FFLAGS='-g -fsanitize=address -fno-omit-frame-pointer'
- export FCFLAGS='-g -fsanitize=address -fno-omit-frame-pointer -Werror'
- export DISTCHECK_CONFIGURE_FLAGS='--enable-fortran'
- ./configure --enable-fortran --enable-developer-docs
- make -j distcheck
Expand Down
3 changes: 0 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,6 @@ AC_DEFINE([_NETCDF], [1], [netCDF classic library available])
# We must have MPI to build PIO.
AC_DEFINE([HAVE_MPI], [1], [defined by CMake build])

# ???
AC_DEFINE([INCLUDE_CMAKE_FCI], [1], [defined by CMake build])

# All builds are on LINUX.
AC_DEFINE([LINUX], [1], [defined by CMake build])

Expand Down
2 changes: 1 addition & 1 deletion libpio.settings.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Extra libraries: @LIBS@
Fortran Compiler: @FC_VERSION@
FFLAGS: @FFLAGS@
FCFLAGS: @FCFLAGS@
FPPFLAGS: @FPPFLAGS@
More Fortran Flags: @FPPFLAGS@

# Features
--------
Expand Down

0 comments on commit c99eb28

Please sign in to comment.