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

Syntax corrections.

Browse Source
This commit is contained in:
Ward Fisher 2017-09-26 14:01:21 -06:00
parent a812b69ce4
commit 3c61d86367
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -766,11 +766,11 @@ ENDIF(ENABLE_CDF5)
# Option to Build DAP2+DAP4 Clients
OPTION(ENABLE_DAP "Enable DAP2 and DAP4 Client." ON)
IF(ENABLE_DAP)
SET(USE_DAP ON)
SET(ENABLE_DAP2 ON)
SET(ENABLE_DAP4 ON)
SET(USE_DAP ON CACHE BOOL "Whether to use dap")
SET(ENABLE_DAP2 ON CACHE BOOL "Whether we have DAP2.")
SET(ENABLE_DAP4 ON CACHE BOOL "Wehther we have DAP4.")
IF(NOT ENABLE_NETCDF_4)
SET(ENABLE_DAP4 OFF)
SET(ENABLE_DAP4 OFF CACHE BOOL "")
ENDIF()
FIND_PACKAGE(CURL)
IF(NOT CURL_LIBRARY)
@ -1896,13 +1896,14 @@ is_enabled(USE_SZIP HAS_SZIP)
is_enabled(STATUS_PNETCDF HAS_PNETCDF)
is_enabled(STATUS_PARALLEL HAS_PARALLEL)
is_enabled(ENABLE_PARALLEL4 HAS_PARALLEL4)
is_enabled(ENABLE_DAP HAS_DAP)
is_enabled(ENABLE_DAP HAS_DAP2)
is_enabled(ENABLE_DAP4 HAS_DAP4)
is_enabled(USE_DISKLESS HAS_DISKLESS)
is_enabled(USE_MMAP HAS_MMAP)
is_enabled(JNA HAS_JNA)
is_enabled(STATUS_RELAX_COORD_BOUND RELAX_COORD_BOUND)
is_enabled(ENABLE_CDF5 HAS_CDF5)
is_enabled(USE_CDF5 HAS_CDF5)
# Generate file from template.
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in"

1
configure.ac
View File

@ -1378,6 +1378,7 @@ AC_DEFINE([JNA], [1], [if true, include JNA bug fix])
fi
AC_SUBST(NC_LIBS,[$NC_LIBS])
AC_SUBST(HAS_DAP,[$enable_dap])
AC_SUBST(HAS_DAP2,[$enable_dap])
AC_SUBST(HAS_DAP4,[$enable_dap4])
AC_SUBST(HAS_NC2,[$nc_build_v2])

10
nc-config.cmake.in
View File

@ -13,10 +13,8 @@ cc="@CMAKE_C_COMPILER@"
cflags="-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
libs="-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ @NC_LIBS@"
if [ -z "@USE_DAP@" -o -z "@ENABLE_DAP2@" ] ; then
has_dap2=ON
fi
if [ -z $has_dap2 ]; then
has_dap2="@ENABLE_DAP2@"
if [ -z $has_dap2 -o "$has_dap2" = "OFF" ]; then
has_dap2="no"
else
has_dap2="yes"
@ -80,8 +78,8 @@ else
has_szlib="yes"
fi
has_cdf5="@USE_CDF5@"
if [ -z "has_cdf5" -o "$has_cdf5" = "OFF" ]; then
has_cdf5="@ENABLE_CDF5@"
if [ -z "has_cdf5" -o "$has_cdf5" = "OFF" -o "$has_cdf5" = "FALSE" ]; then
has_cdf5="no"
else
has_cdf5="yes"