mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made 'dynamic loading' the default, to match the default for hdf5.

Browse Source
This commit is contained in:
Ward Fisher 2014-05-05 15:37:47 -06:00
parent fb06580a5b
commit f0e3bc696f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -583,10 +583,6 @@ ENDIF()
# Option to Enable HDF5
OPTION(USE_SZIP "Use SZip" OFF)
OPTION(USE_HDF5 "Use HDF5." ${ENABLE_NETCDF_4})
OPTION(ENABLE_DYNAMIC_LOADING "Enable Dynamic Loading" OFF)
IF(ENABLE_DYNAMIC_LOADING)
SET(USE_LIBDL ON CACHE BOOL "")
ENDIF()
IF(USE_HDF5 OR ENABLE_NETCDF_4)
SET(USE_HDF5 ON)
@ -634,6 +630,12 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
IF(HDF5_IS_PARALLEL_MPIPOSIX)
SET(USE_PARALLEL_POSIX ON)
ENDIF()
OPTION(ENABLE_DYNAMIC_LOADING "Enable Dynamic Loading" ON)
IF(ENABLE_DYNAMIC_LOADING)
SET(USE_LIBDL ON CACHE BOOL "")
ENDIF()
ENDIF(NOT MSVC)
# Assert HDF5 version.

2
configure.ac
View File

@ -137,7 +137,7 @@ fi
AC_MSG_CHECKING([do we require hdf5 dynamic-loading support])
AC_ARG_ENABLE([dynamic-loading], [AS_HELP_STRING([--enable-dynamic-loading],
[enable dynamic loading for use with supported hdf5 installs (libdl, HDF5 required)])])
test "x$enable_dynamic_loading" = xyes || enable_dynamic_loading=xno
test "x$enable_dynamic_loading" = xno || enable_dynamic_loading=yes
AC_MSG_RESULT([$enable_dynamic_loading])
# Does the user want to turn on HDF4 read ability?