Skip to content

Commit

Permalink
Merge pull request #1742 from NCAR/ejh_flags
Browse files Browse the repository at this point in the history
removed unused VARN pre-processor defines
  • Loading branch information
edwardhartnett authored Aug 31, 2020
2 parents 3ce5db5 + 666731d commit 63662f5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,6 @@ fi
# If we have parallel-netcdf, then set these as well.
if test x$ac_cv_lib_pnetcdf_ncmpi_create = xyes; then
AC_DEFINE([_PNETCDF], [1], [parallel-netcdf library available])
AC_DEFINE([USE_PNETCDF_VARN], [1], [defined by CMake build])
AC_DEFINE([USE_PNETCDF_VARN_ON_READ], [1], [defined by CMake build])
fi

# Do we have netCDF-4?
Expand Down
12 changes: 6 additions & 6 deletions src/clib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ if (PnetCDF_C_FOUND)

# Check library for varn functions
set (CMAKE_REQUIRED_LIBRARIES ${PnetCDF_C_LIBRARY})
check_function_exists (ncmpi_get_varn PnetCDF_C_HAS_VARN)
if (PnetCDF_C_HAS_VARN)
target_compile_definitions(pioc
PUBLIC USE_PNETCDF_VARN
PUBLIC USE_PNETCDF_VARN_ON_READ)
endif()
# check_function_exists (ncmpi_get_varn PnetCDF_C_HAS_VARN)
# if (PnetCDF_C_HAS_VARN)
# target_compile_definitions(pioc
# PUBLIC USE_PNETCDF_VARN
# PUBLIC USE_PNETCDF_VARN_ON_READ)
# endif()
endif ()

#===== Add EXTRAs =====
Expand Down

0 comments on commit 63662f5

Please sign in to comment.