From d270aa8e933cfb12d9d8e9c0fdea7ad001c7e1da Mon Sep 17 00:00:00 2001 From: Kyle Shores Date: Mon, 18 Mar 2024 15:32:23 -0500 Subject: [PATCH] Replace ENABLE_DAP with NETCDF_ENABLE_DAP --- .github/workflows/run_tests_osx.yml | 18 +++++----- .github/workflows/run_tests_ubuntu.yml | 18 +++++----- CMakeLists.txt | 46 +++++++++++++------------- COMPILE.cmake.txt | 2 +- Makefile.am | 4 +-- cmake/netcdf_functions_macros.cmake | 6 ++-- config.h.cmake.in | 6 ++-- config.h.cmake.in.old-works | 6 ++-- configure.ac | 16 ++++----- ctest_scripts/ctest_serial_dap.ctest | 2 +- dap4_test/CMakeLists.txt | 6 ++-- dap4_test/Makefile.am | 2 +- include/ncdispatch.h | 4 +-- libdap2/Makefile.am | 4 +-- libdap4/Makefile.am | 4 +-- libdispatch/ddispatch.c | 8 ++--- libdispatch/dfile.c | 8 ++--- libdispatch/dinstance.c | 2 +- liblib/CMakeLists.txt | 4 +-- liblib/Makefile.am | 12 +++---- liblib/nc_initialize.c | 12 +++---- libsrc4/nc4type.c | 2 +- nc-config.cmake.in | 4 +-- ncdap_test/CMakeLists.txt | 10 +++--- ncdap_test/Makefile.am | 12 +++---- ncdap_test/findtestserver.c.in | 4 +-- ncdump/CMakeLists.txt | 16 ++++----- ncdump/Makefile.am | 2 +- 28 files changed, 120 insertions(+), 120 deletions(-) diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml index 042f2f180..a0a3f3aeb 100644 --- a/.github/workflows/run_tests_osx.yml +++ b/.github/workflows/run_tests_osx.yml @@ -79,9 +79,9 @@ jobs: echo "ENABLE_HDF4=--enable-hdf4" >> $GITHUB_ENV echo "ENABLE_HDF5=--enable-hdf5" >> $GITHUB_ENV if: matrix.use_nc4 == 'nc4' - - run: echo "ENABLE_DAP=--disable-dap" >> $GITHUB_ENV + - run: echo "NETCDF_ENABLE_DAP=--disable-dap" >> $GITHUB_ENV if: matrix.use_dap == 'dap_off' - - run: echo "ENABLE_DAP=--enable-dap" >> $GITHUB_ENV + - run: echo "NETCDF_ENABLE_DAP=--enable-dap" >> $GITHUB_ENV if: matrix.use_dap == 'dap_on' - run: echo "ENABLE_NCZARR=--disable-nczarr" >> $GITHUB_ENV if: matrix.use_nczarr == 'nczarr_off' @@ -116,7 +116,7 @@ jobs: - name: Configure shell: bash -l {0} - run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure ${ENABLE_HDF5} ${ENABLE_DAP} ${ENABLE_NCZARR} + run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure ${ENABLE_HDF5} ${NETCDF_ENABLE_DAP} ${ENABLE_NCZARR} if: ${{ success() }} - name: Look at config.log if error @@ -145,7 +145,7 @@ jobs: # - name: Make Distcheck # shell: bash -l {0} - # run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DISTCHECK_CONFIGURE_FLAGS="${ENABLE_HDF4} ${ENABLE_HDF5} ${ENABLE_DAP} ${ENABLE_NCZARR}" make distcheck + # run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DISTCHECK_CONFIGURE_FLAGS="${ENABLE_HDF4} ${ENABLE_HDF5} ${NETCDF_ENABLE_DAP} ${ENABLE_NCZARR}" make distcheck # if: ${{ success() }} #- name: Start SSH Debug @@ -184,9 +184,9 @@ jobs: echo "ENABLE_HDF4=ON" >> $GITHUB_ENV echo "ENABLE_HDF5=ON" >> $GITHUB_ENV if: matrix.use_nc4 == 'nc4' - - run: echo "ENABLE_DAP=OFF" >> $GITHUB_ENV + - run: echo "NETCDF_ENABLE_DAP=OFF" >> $GITHUB_ENV if: matrix.use_dap == 'dap_off' - - run: echo "ENABLE_DAP=ON" >> $GITHUB_ENV + - run: echo "NETCDF_ENABLE_DAP=ON" >> $GITHUB_ENV if: matrix.use_dap == 'dap_on' - run: echo "ENABLE_NCZARR=OFF" >> $GITHUB_ENV if: matrix.use_nczarr == 'nczarr_off' @@ -218,7 +218,7 @@ jobs: run: | mkdir build cd build - LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DENABLE_DAP=${ENABLE_DAP} -DENABLE_HDF5=${ENABLE_HDF5} -DENABLE_NCZARR=${ENABLE_NCZARR} + LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DNETCDF_ENABLE_DAP=${NETCDF_ENABLE_DAP} -DENABLE_HDF5=${ENABLE_HDF5} -DENABLE_NCZARR=${ENABLE_NCZARR} - name: Print Summary shell: bash -l {0} @@ -375,7 +375,7 @@ jobs: run: | mkdir build cd build - LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DENABLE_DAP=TRUE -DENABLE_HDF5=TRUE -DENABLE_NCZARR=TRUE -D ENABLE_DAP_LONG_TESTS=TRUE -DENABLE_LIBXML2=FALSE + LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DNETCDF_ENABLE_DAP=TRUE -DENABLE_HDF5=TRUE -DENABLE_NCZARR=TRUE -D NETCDF_ENABLE_DAP_LONG_TESTS=TRUE -DENABLE_LIBXML2=FALSE - name: Print Summary shell: bash -l {0} @@ -450,7 +450,7 @@ jobs: run: | mkdir build cd build - LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DENABLE_DAP=TRUE -DENABLE_HDF5=TRUE -DENABLE_NCZARR=TRUE -D ENABLE_DAP_LONG_TESTS=TRUE -DENABLE_LIBXML2=FALSE -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DNETCDF_ENABLE_DAP=TRUE -DENABLE_HDF5=TRUE -DENABLE_NCZARR=TRUE -D NETCDF_ENABLE_DAP_LONG_TESTS=TRUE -DENABLE_LIBXML2=FALSE -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - name: Print Summary shell: bash -l {0} diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml index a6a17bf8a..143d3e801 100644 --- a/.github/workflows/run_tests_ubuntu.yml +++ b/.github/workflows/run_tests_ubuntu.yml @@ -440,7 +440,7 @@ jobs: run: | mkdir build cd build - LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DENABLE_DAP=TRUE -DENABLE_HDF5=TRUE -DENABLE_NCZARR=TRUE -DENABLE_DAP_LONG_TESTS=TRUE -DENABLE_LIBXML2=FALSE + LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DNETCDF_ENABLE_DAP=TRUE -DENABLE_HDF5=TRUE -DENABLE_NCZARR=TRUE -DNETCDF_ENABLE_DAP_LONG_TESTS=TRUE -DENABLE_LIBXML2=FALSE - name: Print Summary shell: bash -l {0} @@ -521,7 +521,7 @@ jobs: run: | mkdir build cd build - LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DENABLE_DAP=TRUE -DENABLE_HDF5=TRUE -DENABLE_NCZARR=TRUE -DENABLE_DAP_LONG_TESTS=TRUE -DENABLE_LIBXML2=FALSE -DBUILD_SHARED_LIBS=FALSE -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DNETCDF_ENABLE_DAP=TRUE -DENABLE_HDF5=TRUE -DENABLE_NCZARR=TRUE -DNETCDF_ENABLE_DAP_LONG_TESTS=TRUE -DENABLE_LIBXML2=FALSE -DBUILD_SHARED_LIBS=FALSE -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - name: Print Summary shell: bash -l {0} @@ -602,7 +602,7 @@ jobs: run: | mkdir build cd build - LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_C_COMPILER=mpicc -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DENABLE_DAP=TRUE -DENABLE_HDF5=TRUE -DENABLE_NCZARR=TRUE -D ENABLE_DAP_LONG_TESTS=TRUE -DENABLE_PNETCDF=TRUE + LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_C_COMPILER=mpicc -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DNETCDF_ENABLE_DAP=TRUE -DENABLE_HDF5=TRUE -DENABLE_NCZARR=TRUE -D NETCDF_ENABLE_DAP_LONG_TESTS=TRUE -DENABLE_PNETCDF=TRUE - name: Print Summary shell: bash -l {0} @@ -684,9 +684,9 @@ jobs: - run: | echo "ENABLE_HDF5=--enable-hdf5" >> $GITHUB_ENV if: matrix.use_nc4 == 'nc4' - - run: echo "ENABLE_DAP=--disable-dap" >> $GITHUB_ENV + - run: echo "NETCDF_ENABLE_DAP=--disable-dap" >> $GITHUB_ENV if: matrix.use_dap == 'dap_off' - - run: echo "ENABLE_DAP=--enable-dap" >> $GITHUB_ENV + - run: echo "NETCDF_ENABLE_DAP=--enable-dap" >> $GITHUB_ENV if: matrix.use_dap == 'dap_on' - run: echo "ENABLE_NCZARR=--disable-nczarr" >> $GITHUB_ENV if: matrix.use_nczarr == 'nczarr_off' @@ -738,7 +738,7 @@ jobs: done current_directory="$(pwd)" mkdir ../build - cd ../build && CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} "${current_directory}/configure" ${ENABLE_HDF5} ${ENABLE_DAP} ${ENABLE_NCZARR} + cd ../build && CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} "${current_directory}/configure" ${ENABLE_HDF5} ${NETCDF_ENABLE_DAP} ${ENABLE_NCZARR} if: ${{ success() }} - name: Look at config.log if error @@ -826,9 +826,9 @@ jobs: - run: | echo "ENABLE_HDF5=ON" >> $GITHUB_ENV if: matrix.use_nc4 == 'nc4' - - run: echo "ENABLE_DAP=OFF" >> $GITHUB_ENV + - run: echo "NETCDF_ENABLE_DAP=OFF" >> $GITHUB_ENV if: matrix.use_dap == 'dap_off' - - run: echo "ENABLE_DAP=ON" >> $GITHUB_ENV + - run: echo "NETCDF_ENABLE_DAP=ON" >> $GITHUB_ENV if: matrix.use_dap == 'dap_on' - run: echo "ENABLE_NCZARR=OFF" >> $GITHUB_ENV if: matrix.use_nczarr == 'nczarr_off' @@ -860,7 +860,7 @@ jobs: run: | mkdir build cd build - LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DENABLE_DAP=${ENABLE_DAP} -DENABLE_HDF5=${ENABLE_HDF5} -DENABLE_NCZARR=${ENABLE_NCZARR} + LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DNETCDF_ENABLE_DAP=${NETCDF_ENABLE_DAP} -DENABLE_HDF5=${ENABLE_HDF5} -DENABLE_NCZARR=${ENABLE_NCZARR} - name: Print Summary shell: bash -l {0} diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b902c13a..142ed8a32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -441,7 +441,7 @@ if(NOT ENABLE_HDF5 OR NOT ENABLE_NETCDF4 OR NOT ENABLE_NETCDF_4) set(ENABLE_HDF5 OFF CACHE BOOL "Use HDF5" FORCE) endif() option(ENABLE_HDF4 "Build netCDF-4 with HDF4 read capability(HDF4, HDF5 and Zlib required)." OFF) -option(ENABLE_DAP "Enable DAP2 and DAP4 Client." ON) +option(NETCDF_ENABLE_DAP "Enable DAP2 and DAP4 Client." ON) option(ENABLE_NCZARR "Enable NCZarr Client." ON) option(ENABLE_PNETCDF "Build with parallel I/O for CDF-1, 2, and 5 files using PnetCDF." OFF) set(NETCDF_ENABLE_CDF5 AUTO CACHE STRING "AUTO") @@ -458,9 +458,9 @@ endif() option(ENABLE_REMOTE_FUNCTIONALITY "Enable|disable all forms remote data access (DAP, S3, etc)" ON) message(">>> ENABLE_REMOTE_FUNCTIONALITY=${ENABLE_REMOTE_FUNCTIONALITY}") if(NOT ENABLE_REMOTE_FUNCTIONALITY) -message(WARNING "ENABLE_REMOTE_FUNCTIONALITY=NO => ENABLE_DAP[4]=NO") -set(ENABLE_DAP OFF CACHE BOOL "ENABLE_REMOTE_FUNCTIONALITY=NO => ENABLE_DAP=NO" FORCE) -set(ENABLE_DAP4 OFF CACHE BOOL "ENABLE_REMOTE_FUNCTIONALITY=NO => ENABLE_DAP4=NO" FORCE) +message(WARNING "ENABLE_REMOTE_FUNCTIONALITY=NO => NETCDF_ENABLE_DAP[4]=NO") +set(NETCDF_ENABLE_DAP OFF CACHE BOOL "ENABLE_REMOTE_FUNCTIONALITY=NO => NETCDF_ENABLE_DAP=NO" FORCE) +set(NETCDF_ENABLE_DAP4 OFF CACHE BOOL "ENABLE_REMOTE_FUNCTIONALITY=NO => NETCDF_ENABLE_DAP4=NO" FORCE) endif() # Option to Build DLL @@ -519,21 +519,21 @@ endif(ENABLE_STRICT_NULL_BYTE_HEADER_PADDING) set(USE_HDF5 ${ENABLE_HDF5}) -if(ENABLE_DAP) +if(NETCDF_ENABLE_DAP) set(USE_DAP ON CACHE BOOL "") - set(ENABLE_DAP2 ON CACHE BOOL "") + set(NETCDF_ENABLE_DAP2 ON CACHE BOOL "") if(ENABLE_HDF5) message(STATUS "Enabling DAP4") - set(ENABLE_DAP4 ON CACHE BOOL "") + set(NETCDF_ENABLE_DAP4 ON CACHE BOOL "") else() message(STATUS "Disabling DAP4") - set(ENABLE_DAP4 OFF CACHE BOOL "") + set(NETCDF_ENABLE_DAP4 OFF CACHE BOOL "") endif(ENABLE_HDF5) else() - set(ENABLE_DAP2 OFF CACHE BOOL "") - set(ENABLE_DAP4 OFF CACHE BOOL "") + set(NETCDF_ENABLE_DAP2 OFF CACHE BOOL "") + set(NETCDF_ENABLE_DAP4 OFF CACHE BOOL "") endif() # Option to support byte-range reading of remote datasets @@ -544,14 +544,14 @@ set(NETCDF_ENABLE_BYTERANGE OFF CACHE BOOL "ENABLE_REMOTE_FUNCTIONALITY=NO => NE endif() # Option to Enable DAP long tests, remote tests. -option(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON) +option(NETCDF_ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON) option(ENABLE_EXTERNAL_SERVER_TESTS "Enable external Server remote tests." OFF) -option(ENABLE_DAP_LONG_TESTS "Enable DAP long tests." OFF) +option(NETCDF_ENABLE_DAP_LONG_TESTS "Enable DAP long tests." OFF) -if(NOT ENABLE_DAP) -set(ENABLE_DAP_REMOTE_TESTS OFF CACHE BOOL "" FORCE) +if(NOT NETCDF_ENABLE_DAP) +set(NETCDF_ENABLE_DAP_REMOTE_TESTS OFF CACHE BOOL "" FORCE) set(ENABLE_EXTERNAL_SERVER_TESTS OFF CACHE BOOL "" FORCE) -set(ENABLE_DAP_LONG_TESTS OFF CACHE BOOL "" FORCE) +set(NETCDF_ENABLE_DAP_LONG_TESTS OFF CACHE BOOL "" FORCE) endif() set(REMOTETESTSERVERS "remotetest.unidata.ucar.edu" CACHE STRING "test servers to use for remote test") @@ -1082,7 +1082,7 @@ endif() # Set some of the options as advanced. MARK_AS_ADVANCED(ENABLE_INTERNAL_DOCS VALGRIND_TESTS NETCDF_ENABLE_COVERAGE_TESTS ) -MARK_AS_ADVANCED(ENABLE_DAP_REMOTE_TESTS ENABLE_DAP_LONG_TESTS USE_REMOTE_CDASH ENABLE_EXTERNAL_SERVER_TESTS) +MARK_AS_ADVANCED(NETCDF_ENABLE_DAP_REMOTE_TESTS NETCDF_ENABLE_DAP_LONG_TESTS USE_REMOTE_CDASH ENABLE_EXTERNAL_SERVER_TESTS) MARK_AS_ADVANCED(ENABLE_DOXYGEN_BUILD_RELEASE_DOCS NETCDF_DOXYGEN_ENABLE_TASKS ENABLE_DOXYGEN_SERVER_SIDE_SEARCH) MARK_AS_ADVANCED(ENABLE_SHARED_LIBRARY_VERSION) @@ -1390,12 +1390,12 @@ if(USE_HDF4) add_subdirectory(hdf4_test) endif(USE_HDF4) -if(ENABLE_DAP2) +if(NETCDF_ENABLE_DAP2) add_subdirectory(oc2) add_subdirectory(libdap2) endif() -if(ENABLE_DAP4) +if(NETCDF_ENABLE_DAP4) add_subdirectory(libdap4) add_subdirectory(libncxml) else() @@ -1451,10 +1451,10 @@ if(ENABLE_TESTS) add_subdirectory(nc_test4) add_subdirectory(h5_test) endif() - if(ENABLE_DAP2) + if(NETCDF_ENABLE_DAP2) add_subdirectory(ncdap_test) endif() - if(ENABLE_DAP4) + if(NETCDF_ENABLE_DAP4) add_subdirectory(dap4_test) endif() if(ENABLE_EXAMPLES) @@ -1628,9 +1628,9 @@ is_enabled(OFF HAS_BENCHMARKS) 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_DAP2 HAS_DAP2) -is_enabled(ENABLE_DAP4 HAS_DAP4) +is_enabled(NETCDF_ENABLE_DAP HAS_DAP) +is_enabled(NETCDF_ENABLE_DAP2 HAS_DAP2) +is_enabled(NETCDF_ENABLE_DAP4 HAS_DAP4) is_enabled(NETCDF_ENABLE_BYTERANGE HAS_BYTERANGE) is_enabled(ENABLE_DISKLESS HAS_DISKLESS) is_enabled(USE_MMAP HAS_MMAP) diff --git a/COMPILE.cmake.txt b/COMPILE.cmake.txt index a8b395244..d8fd5ae50 100644 --- a/COMPILE.cmake.txt +++ b/COMPILE.cmake.txt @@ -70,7 +70,7 @@ Common NetCDF/CMake Options ********************* - ENABLE_NETCDF_4 (On by Default) -- ENABLE_DAP (On by Default) +- NETCDF_ENABLE_DAP (On by Default) - BUILD_SHARED_LIBS (Off by Default for Windows, On by Default for Unix/Linux) - ENABLE_DLL (Windows Only, Off by Default) diff --git a/Makefile.am b/Makefile.am index cf824db36..b1f9f0180 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,13 +76,13 @@ endif endif # Build the dap2 client -if ENABLE_DAP +if NETCDF_ENABLE_DAP OCLIB = oc2 DAP2 = libdap2 NCDAP2TESTDIR = ncdap_test endif -if ENABLE_DAP4 +if NETCDF_ENABLE_DAP4 DAP4 = libdap4 NCDAP4TESTDIR = dap4_test XML = libncxml diff --git a/cmake/netcdf_functions_macros.cmake b/cmake/netcdf_functions_macros.cmake index ed0d0df26..83a05239c 100644 --- a/cmake/netcdf_functions_macros.cmake +++ b/cmake/netcdf_functions_macros.cmake @@ -220,8 +220,8 @@ macro(print_conf_summary) message("") message(STATUS "Building Shared Libraries: ${BUILD_SHARED_LIBS}") message(STATUS "Building netCDF-4: ${ENABLE_NETCDF_4}") - message(STATUS "Building DAP2 Support: ${ENABLE_DAP2}") - message(STATUS "Building DAP4 Support: ${ENABLE_DAP4}") + message(STATUS "Building DAP2 Support: ${NETCDF_ENABLE_DAP2}") + message(STATUS "Building DAP4 Support: ${NETCDF_ENABLE_DAP4}") message(STATUS "Building Byte-range Support: ${NETCDF_ENABLE_BYTERANGE}") message(STATUS "Building Utilities: ${NETCDF_BUILD_UTILITIES}") if(CMAKE_PREFIX_PATH) @@ -238,7 +238,7 @@ macro(print_conf_summary) message("Tests Enabled: ${ENABLE_TESTS}") if(ENABLE_TESTS) - message(STATUS "DAP Remote Tests: ${ENABLE_DAP_REMOTE_TESTS}") + message(STATUS "DAP Remote Tests: ${NETCDF_ENABLE_DAP_REMOTE_TESTS}") message(STATUS "Extra Tests: ${ENABLE_EXTRA_TESTS}") message(STATUS "Coverage Tests: ${NETCDF_ENABLE_COVERAGE_TESTS}") message(STATUS "Parallel Tests: ${ENABLE_PARALLEL_TESTS}") diff --git a/config.h.cmake.in b/config.h.cmake.in index e812bb6c0..bd39bbe02 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -137,13 +137,13 @@ are set when opening a binary file on Windows. */ #cmakedefine USE_STRICT_NULL_BYTE_HEADER_PADDING 1 /* if true, build DAP2 and DAP4 Client */ -#cmakedefine ENABLE_DAP 1 +#cmakedefine NETCDF_ENABLE_DAP 1 /* if true, build DAP4 Client */ -#cmakedefine ENABLE_DAP4 1 +#cmakedefine NETCDF_ENABLE_DAP4 1 /* if true, do remote tests */ -#cmakedefine ENABLE_DAP_REMOTE_TESTS 1 +#cmakedefine NETCDF_ENABLE_DAP_REMOTE_TESTS 1 /* if true, enable NCZARR */ #cmakedefine ENABLE_NCZARR 1 diff --git a/config.h.cmake.in.old-works b/config.h.cmake.in.old-works index be1bbe264..362142ce2 100644 --- a/config.h.cmake.in.old-works +++ b/config.h.cmake.in.old-works @@ -87,9 +87,9 @@ are set when opening a binary file on Windows. */ #cmakedefine VALGRIND_TESTS 1 #cmakedefine ENABLE_CDMREMOTE 1 #cmakedefine USE_DAP 1 -#cmakedefine ENABLE_DAP 1 -#cmakedefine ENABLE_DAP_GROUPS 1 -#cmakedefine ENABLE_DAP_REMOTE_TESTS 1 +#cmakedefine NETCDF_ENABLE_DAP 1 +#cmakedefine NETCDF_ENABLE_DAP_GROUPS 1 +#cmakedefine NETCDF_ENABLE_DAP_REMOTE_TESTS 1 #cmakedefine EXTRA_TESTS #cmakedefine USE_NETCDF4 1 #cmakedefine USE_HDF4 1 diff --git a/configure.ac b/configure.ac index 4312ceeb3..730afe503 100644 --- a/configure.ac +++ b/configure.ac @@ -682,11 +682,11 @@ AC_DEFINE_UNQUOTED([REMOTETESTSERVERS], ["$REMOTETESTSERVERS"], [the testservers # Set the config.h flags if test "x$enable_dap" = xyes; then AC_DEFINE([USE_DAP], [1], [if true, build DAP Client]) - AC_DEFINE([ENABLE_DAP], [1], [if true, build DAP Client]) + AC_DEFINE([NETCDF_ENABLE_DAP], [1], [if true, build DAP Client]) fi if test "x$enable_dap_remote_tests" = xyes; then - AC_DEFINE([ENABLE_DAP_REMOTE_TESTS], [1], [if true, do remote tests]) + AC_DEFINE([NETCDF_ENABLE_DAP_REMOTE_TESTS], [1], [if true, do remote tests]) fi if test "x$enable_external_server_tests" = xyes; then AC_DEFINE([ENABLE_EXTERNAL_SERVER_TESTS], [1], [if true, do remote external tests]) @@ -1330,7 +1330,7 @@ if test "x$enable_hdf5" = "xno" ; then fi if test "x$enable_dap4" = xyes; then - AC_DEFINE([ENABLE_DAP4], [1], [if true, build DAP4 Client]) + AC_DEFINE([NETCDF_ENABLE_DAP4], [1], [if true, build DAP4 Client]) fi # check for useful, but not essential, memio support @@ -1904,14 +1904,14 @@ AM_CONDITIONAL(TEST_PARALLEL4, [test "x$enable_parallel4" = xyes -a "x$enable_pa AM_CONDITIONAL(BUILD_DAP, [test "x$enable_dap" = xyes]) AM_CONDITIONAL(USE_DAP, [test "x$enable_dap" = xyes]) # Alias # Provide protocol specific flags -AM_CONDITIONAL(ENABLE_DAP, [test "x$enable_dap" = xyes]) -AM_CONDITIONAL(ENABLE_DAP4, [test "x$enable_dap4" = xyes]) +AM_CONDITIONAL(NETCDF_ENABLE_DAP, [test "x$enable_dap" = xyes]) +AM_CONDITIONAL(NETCDF_ENABLE_DAP4, [test "x$enable_dap4" = xyes]) AM_CONDITIONAL(USE_STRICT_NULL_BYTE_HEADER_PADDING, [test x$enable_strict_null_byte_header_padding = xyes]) AM_CONDITIONAL(NETCDF_ENABLE_CDF5, [test "x$enable_cdf5" = xyes]) -AM_CONDITIONAL(ENABLE_DAP_REMOTE_TESTS, [test "x$enable_dap_remote_tests" = xyes]) +AM_CONDITIONAL(NETCDF_ENABLE_DAP_REMOTE_TESTS, [test "x$enable_dap_remote_tests" = xyes]) AM_CONDITIONAL(ENABLE_EXTERNAL_SERVER_TESTS, [test "x$enable_external_server_tests" = xyes]) -AM_CONDITIONAL(ENABLE_DAP_AUTH_TESTS, [test "x$enable_dap_auth_tests" = xyes]) -AM_CONDITIONAL(ENABLE_DAP_LONG_TESTS, [test "x$enable_dap_long_tests" = xyes]) +AM_CONDITIONAL(NETCDF_ENABLE_DAP_AUTH_TESTS, [test "x$enable_dap_auth_tests" = xyes]) +AM_CONDITIONAL(NETCDF_ENABLE_DAP_LONG_TESTS, [test "x$enable_dap_long_tests" = xyes]) AM_CONDITIONAL(USE_PNETCDF_DIR, [test ! "x$PNETCDFDIR" = x]) AM_CONDITIONAL(USE_LOGGING, [test "x$enable_logging" = xyes]) AM_CONDITIONAL(CROSS_COMPILING, [test "x$cross_compiling" = xyes]) diff --git a/ctest_scripts/ctest_serial_dap.ctest b/ctest_scripts/ctest_serial_dap.ctest index 896213b82..7ed1490d7 100644 --- a/ctest_scripts/ctest_serial_dap.ctest +++ b/ctest_scripts/ctest_serial_dap.ctest @@ -33,7 +33,7 @@ find_program(CTEST_GIT_COMMAND NAMES git) find_program(CTEST_COVERAGE_COMMAND NAMES gcov) find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind) -set(CTEST_BUILD_OPTIONS "-DNETCDF_ENABLE_COVERAGE_TESTS=TRUE -DENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DNETCDF_ENABLE_BYTERANGE=TRUE -DENABLE_LARGE_FILE_TESTS=FALSE -DENABLE_DAP_REMOTE_TESTS=TRUE") +set(CTEST_BUILD_OPTIONS "-DNETCDF_ENABLE_COVERAGE_TESTS=TRUE -DENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DNETCDF_ENABLE_BYTERANGE=TRUE -DENABLE_LARGE_FILE_TESTS=FALSE -DNETCDF_ENABLE_DAP_REMOTE_TESTS=TRUE") set(CTEST_DROP_METHOD https) diff --git a/dap4_test/CMakeLists.txt b/dap4_test/CMakeLists.txt index 4d0f85875..5075b80ca 100644 --- a/dap4_test/CMakeLists.txt +++ b/dap4_test/CMakeLists.txt @@ -21,7 +21,7 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh) FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE) -IF(ENABLE_DAP_REMOTE_TESTS) +IF(NETCDF_ENABLE_DAP_REMOTE_TESTS) # Change name (add '4') to avoid cmake # complaint about duplicate targets. BUILD_BIN_TEST(findtestserver4) @@ -50,7 +50,7 @@ ENDIF() add_sh_test(dap4_test test_data) ENDIF(NETCDF_BUILD_UTILITIES) - IF(ENABLE_DAP_REMOTE_TESTS) + IF(NETCDF_ENABLE_DAP_REMOTE_TESTS) add_sh_test(dap4_test test_remote) add_sh_test(dap4_test test_hyrax) add_sh_test(dap4_test test_dap4url) @@ -66,7 +66,7 @@ ENDIF() IF(RUN_IGNORED_TESTS) add_sh_test(dap4_test test_thredds) ENDIF() - ENDIF(ENABLE_DAP_REMOTE_TESTS) + ENDIF(NETCDF_ENABLE_DAP_REMOTE_TESTS) ENDIF(ENABLE_TESTS) diff --git a/dap4_test/Makefile.am b/dap4_test/Makefile.am index c4d165cdd..36d74d373 100644 --- a/dap4_test/Makefile.am +++ b/dap4_test/Makefile.am @@ -43,7 +43,7 @@ dump_SOURCES = dump.c # Disable Dap4 Remote Tests until the test server is working if NETCDF_BUILD_UTILITIES -if ENABLE_DAP_REMOTE_TESTS +if NETCDF_ENABLE_DAP_REMOTE_TESTS TESTS += test_remote.sh TESTS += test_constraints.sh diff --git a/include/ncdispatch.h b/include/ncdispatch.h index 262603673..b6282a46a 100644 --- a/include/ncdispatch.h +++ b/include/ncdispatch.h @@ -104,12 +104,12 @@ extern const NC_Dispatch* NC3_dispatch_table; extern int NC3_initialize(void); extern int NC3_finalize(void); -#ifdef ENABLE_DAP +#ifdef NETCDF_ENABLE_DAP extern const NC_Dispatch* NCD2_dispatch_table; extern int NCD2_initialize(void); extern int NCD2_finalize(void); #endif -#ifdef ENABLE_DAP4 +#ifdef NETCDF_ENABLE_DAP4 extern const NC_Dispatch* NCD4_dispatch_table; extern int NCD4_initialize(void); extern int NCD4_finalize(void); diff --git a/libdap2/Makefile.am b/libdap2/Makefile.am index 135390339..35abca961 100644 --- a/libdap2/Makefile.am +++ b/libdap2/Makefile.am @@ -24,7 +24,7 @@ HDRS= nccommon.h constraints.h ncd2dispatch.h dapincludes.h \ dapodom.h getvara.h dapnc.h daputil.h dapdebug.h dapdump.h \ dceconstraints.h dcetab.h dceparselex.h -if ENABLE_DAP +if NETCDF_ENABLE_DAP if USE_NETCDF4 AM_CPPFLAGS += -I$(top_srcdir)/libsrc4 @@ -44,7 +44,7 @@ libdap2_la_LIBADD = # ${top_builddir}/oc2/liboc.la \ # ${top_builddir}/libdispatch/libdispatch.la # -endif # ENABLE_DAP +endif # NETCDF_ENABLE_DAP # These rule are used if someone wants to rebuild the grammar files. # Otherwise never invoked, but records how to do it. diff --git a/libdap4/Makefile.am b/libdap4/Makefile.am index f16cfd4e5..496dd864a 100644 --- a/libdap4/Makefile.am +++ b/libdap4/Makefile.am @@ -53,7 +53,7 @@ d4odom.h \ d4bytes.h \ d4includes.h -if ENABLE_DAP4 +if NETCDF_ENABLE_DAP4 if USE_NETCDF4 AM_CPPFLAGS += -I$(top_srcdir)/libsrc4 endif @@ -64,4 +64,4 @@ libdap4_la_SOURCES = $(SRC) $(HDRS) libdap4_la_CPPFLAGS += $(AM_CPPFLAGS) libdap4_la_LIBADD = -endif # ENABLE_DAP4 +endif # NETCDF_ENABLE_DAP4 diff --git a/libdispatch/ddispatch.c b/libdispatch/ddispatch.c index a62a24c68..f7d24d682 100644 --- a/libdispatch/ddispatch.c +++ b/libdispatch/ddispatch.c @@ -24,7 +24,7 @@ See LICENSE.txt for license information. #include #endif -#if defined(NETCDF_ENABLE_BYTERANGE) || defined(ENABLE_DAP) || defined(ENABLE_DAP4) +#if defined(NETCDF_ENABLE_BYTERANGE) || defined(NETCDF_ENABLE_DAP) || defined(NETCDF_ENABLE_DAP4) #include #endif @@ -118,7 +118,7 @@ NCDISPATCH_initialize(void) /* Compute type alignments */ NC_compute_alignments(); -#if defined(NETCDF_ENABLE_BYTERANGE) || defined(ENABLE_DAP) || defined(ENABLE_DAP4) +#if defined(NETCDF_ENABLE_BYTERANGE) || defined(NETCDF_ENABLE_DAP) || defined(NETCDF_ENABLE_DAP4) /* Initialize curl if it is being used */ { CURLcode cstat = curl_global_init(CURL_GLOBAL_ALL); @@ -134,10 +134,10 @@ int NCDISPATCH_finalize(void) { int status = NC_NOERR; -#if defined(NETCDF_ENABLE_BYTERANGE) || defined(ENABLE_DAP) || defined(ENABLE_DAP4) +#if defined(NETCDF_ENABLE_BYTERANGE) || defined(NETCDF_ENABLE_DAP) || defined(NETCDF_ENABLE_DAP4) curl_global_cleanup(); #endif -#if defined(ENABLE_DAP4) +#if defined(NETCDF_ENABLE_DAP4) ncxml_finalize(); #endif NC_freeglobalstate(); /* should be one of the last things done */ diff --git a/libdispatch/dfile.c b/libdispatch/dfile.c index 5079a7b94..b86662abc 100644 --- a/libdispatch/dfile.c +++ b/libdispatch/dfile.c @@ -2084,10 +2084,10 @@ NC_open(const char *path0, int omode, int basepe, size_t *chunksizehintp, #ifdef ENABLE_NCZARR | (1< @@ -50,7 +50,7 @@ if(ENABLE_DAP2) ) endif() -if(ENABLE_DAP4) +if(NETCDF_ENABLE_DAP4) target_sources(netcdf PRIVATE $ diff --git a/liblib/Makefile.am b/liblib/Makefile.am index f719ff473..773305b48 100644 --- a/liblib/Makefile.am +++ b/liblib/Makefile.am @@ -53,25 +53,25 @@ libnetcdf_la_LIBADD += ${top_builddir}/libhdf4/libnchdf4.la endif # USE_HDF4 # + dap -if ENABLE_DAP +if NETCDF_ENABLE_DAP AM_CPPFLAGS += -I${top_srcdir}/libdap2 -I${top_srcdir}/oc libnetcdf_la_LIBADD += ${top_builddir}/libdap2/libdap2.la libnetcdf_la_LIBADD += ${top_builddir}/oc2/liboc.la -endif # ENABLE_DAP +endif # NETCDF_ENABLE_DAP -if ENABLE_DAP4 +if NETCDF_ENABLE_DAP4 AM_CPPFLAGS += -I${top_srcdir}/libdap4 libnetcdf_la_LIBADD += ${top_builddir}/libdap4/libdap4.la -endif # ENABLE_DAP4 +endif # NETCDF_ENABLE_DAP4 AM_CPPFLAGS += -I${top_srcdir}/libncxml -if ENABLE_DAP4 +if NETCDF_ENABLE_DAP4 libnetcdf_la_LIBADD += ${top_builddir}/libncxml/libncxml.la else if ENABLE_S3_INTERNAL libnetcdf_la_LIBADD += ${top_builddir}/libncxml/libncxml.la endif -endif # ENABLE_S3_INTERNAL || ENABLE_DAP4 +endif # ENABLE_S3_INTERNAL || NETCDF_ENABLE_DAP4 # NetCDF-4 ... if USE_NETCDF4 diff --git a/liblib/nc_initialize.c b/liblib/nc_initialize.c index 49fe10adc..ccdd693d8 100644 --- a/liblib/nc_initialize.c +++ b/liblib/nc_initialize.c @@ -26,12 +26,12 @@ extern int NC_HDF5_initialize(void); extern int NC_HDF5_finalize(void); #endif -#ifdef ENABLE_DAP2 +#ifdef NETCDF_ENABLE_DAP2 extern int NCD2_initialize(void); extern int NCD2_finalize(void); #endif -#ifdef ENABLE_DAP4 +#ifdef NETCDF_ENABLE_DAP4 extern int NCD4_initialize(void); extern int NCD4_finalize(void); #endif @@ -91,10 +91,10 @@ nc_initialize() /* Initialize each active protocol */ if((stat = NC3_initialize())) goto done; -#ifdef ENABLE_DAP +#ifdef NETCDF_ENABLE_DAP if((stat = NCD2_initialize())) goto done; #endif -#ifdef ENABLE_DAP4 +#ifdef NETCDF_ENABLE_DAP4 if((stat = NCD4_initialize())) goto done; #endif #ifdef USE_PNETCDF @@ -147,10 +147,10 @@ nc_finalize(void) /* Finalize each active protocol */ -#ifdef ENABLE_DAP2 +#ifdef NETCDF_ENABLE_DAP2 if((stat = NCD2_finalize())) failed = stat; #endif -#ifdef ENABLE_DAP4 +#ifdef NETCDF_ENABLE_DAP4 if((stat = NCD4_finalize())) failed = stat; #endif diff --git a/libsrc4/nc4type.c b/libsrc4/nc4type.c index b0361a55a..5a37b9896 100644 --- a/libsrc4/nc4type.c +++ b/libsrc4/nc4type.c @@ -16,7 +16,7 @@ #include #if 0 -#ifdef ENABLE_DAP4 +#ifdef NETCDF_ENABLE_DAP4 EXTERNL NC* NCD4_get_substrate_nc(int ncid); #endif #endif diff --git a/nc-config.cmake.in b/nc-config.cmake.in index a093d1ce3..e9ae0e256 100644 --- a/nc-config.cmake.in +++ b/nc-config.cmake.in @@ -16,14 +16,14 @@ libs="-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ @NC_LIBS@" libsprivate="@LIBS@" HAS_STATIC="" -has_dap2="@ENABLE_DAP2@" +has_dap2="@NETCDF_ENABLE_DAP2@" if [ -z $has_dap2 -o "$has_dap2" = "OFF" ]; then has_dap2="no" else has_dap2="yes" fi -has_dap4="@ENABLE_DAP4@" +has_dap4="@NETCDF_ENABLE_DAP4@" if [ -z $has_dap4 -o "$has_dap4" = "OFF" ]; then has_dap4="no" else diff --git a/ncdap_test/CMakeLists.txt b/ncdap_test/CMakeLists.txt index 4a90548a4..17aa0ab55 100644 --- a/ncdap_test/CMakeLists.txt +++ b/ncdap_test/CMakeLists.txt @@ -15,7 +15,7 @@ FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSION IF(ENABLE_TESTS) - IF(ENABLE_DAP_REMOTE_TESTS) + IF(NETCDF_ENABLE_DAP_REMOTE_TESTS) BUILD_BIN_TEST(findtestserver) BUILD_BIN_TEST(pingurl) ENDIF() @@ -39,7 +39,7 @@ IF(ENABLE_TESTS) add_bin_env_test(ncdap test_vara) ENDIF() - IF(ENABLE_DAP_REMOTE_TESTS) + IF(NETCDF_ENABLE_DAP_REMOTE_TESTS) IF(NETCDF_BUILD_UTILITIES) add_sh_test(ncdap tst_ber) @@ -49,10 +49,10 @@ IF(ENABLE_TESTS) ENDIF(HAVE_BASH) add_sh_test(ncdap tst_zero_len_var) add_sh_test(ncdap tst_fillmismatch) - IF(ENABLE_DAP_LONG_TESTS) + IF(NETCDF_ENABLE_DAP_LONG_TESTS) add_sh_test(ncdap tst_longremote3) SET_TESTS_PROPERTIES(ncdap_tst_longremote3 PROPERTIES RUN_SERIAL TRUE) - ENDIF(ENABLE_DAP_LONG_TESTS) + ENDIF(NETCDF_ENABLE_DAP_LONG_TESTS) IF(TRUE) # Apparently iridl.ldeo.columbia.edu is down for now add_sh_test(ncdap tst_encode) @@ -65,7 +65,7 @@ IF(ENABLE_TESTS) SET_TESTS_PROPERTIES(ncdap_test_manyurls PROPERTIES RUN_SERIAL TRUE) ENDIF() - IF(ENABLE_DAP_AUTH_TESTS) + IF(NETCDF_ENABLE_DAP_AUTH_TESTS) ##obsolete add_bin_test(ncdap t_auth) add_sh_test(ncdap testauth) ENDIF() diff --git a/ncdap_test/Makefile.am b/ncdap_test/Makefile.am index 6c20dc9e5..14f4cc956 100644 --- a/ncdap_test/Makefile.am +++ b/ncdap_test/Makefile.am @@ -28,7 +28,7 @@ t_dap3a_SOURCES = t_dap3a.c t_srcdir.h test_cvt3_SOURCES = test_cvt.c t_srcdir.h test_vara_SOURCES = test_vara.c t_srcdir.h -if ENABLE_DAP +if NETCDF_ENABLE_DAP check_PROGRAMS += t_dap3a test_cvt3 test_vara TESTS += t_dap3a test_cvt3 test_vara if NETCDF_BUILD_UTILITIES @@ -38,7 +38,7 @@ endif # remote tests are optional # because the server may be down or inaccessible -if ENABLE_DAP_REMOTE_TESTS +if NETCDF_ENABLE_DAP_REMOTE_TESTS noinst_PROGRAMS = findtestserver pingurl findtestserver_SOURCES = findtestserver.c pingurl_SOURCES = pingurl.c @@ -55,7 +55,7 @@ TESTS += tst_hyrax.sh TESTS += test_partvar -if ENABLE_DAP_LONG_TESTS +if NETCDF_ENABLE_DAP_LONG_TESTS TESTS += tst_longremote3.sh tst_longremote3.log: tst_remote3.log if ENABLE_EXTERNAL_SERVER_TESTS @@ -84,13 +84,13 @@ check_PROGRAMS += test_partvar check_PROGRAMS += t_misc check_PROGRAMS += t_ncf330 -if ENABLE_DAP_AUTH_TESTS +if NETCDF_ENABLE_DAP_AUTH_TESTS TESTS += testauth.sh endif -endif #ENABLE_DAP_REMOTE_TESTS +endif #NETCDF_ENABLE_DAP_REMOTE_TESTS -endif #ENABLE_DAP +endif #NETCDF_ENABLE_DAP # Need to add subdirs SUBDIRS = testdata3 expected3 expectremote3 expectedhyrax diff --git a/ncdap_test/findtestserver.c.in b/ncdap_test/findtestserver.c.in index 5a2c0c4b3..9b62cf811 100644 --- a/ncdap_test/findtestserver.c.in +++ b/ncdap_test/findtestserver.c.in @@ -61,7 +61,7 @@ main(int argc, char** argv) if(argc >= 3) serverlist = strdup(argv[2]); -#ifdef ENABLE_DAP +#ifdef NETCDF_ENABLE_DAP if(strcasecmp(proto,"thredds")==0) kind = THREDDSKIND; else @@ -69,7 +69,7 @@ main(int argc, char** argv) kind = DAP2KIND; else #endif -#ifdef ENABLE_DAP4 +#ifdef NETCDF_ENABLE_DAP4 if(strcasecmp(proto,"dap4")==0) kind = DAP4KIND; else diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt index 6d43f1b37..0fad5d853 100644 --- a/ncdump/CMakeLists.txt +++ b/ncdump/CMakeLists.txt @@ -54,9 +54,9 @@ if(USE_HDF5) target_link_libraries(nchdf5version netcdf ${ALL_TLL_LIBS}) endif(USE_HDF5) -if(ENABLE_DAP) +if(NETCDF_ENABLE_DAP) add_executable(ocprint ${ocprint_FILES}) -endif(ENABLE_DAP) +endif(NETCDF_ENABLE_DAP) target_link_libraries(ncdump netcdf ${ALL_TLL_LIBS}) target_link_libraries(nccopy netcdf ${ALL_TLL_LIBS}) @@ -64,9 +64,9 @@ target_link_libraries(ncvalidator netcdf ${ALL_TLL_LIBS}) target_link_libraries(ncpathcvt netcdf ${ALL_TLL_LIBS}) target_link_libraries(ncfilteravail netcdf ${ALL_TLL_LIBS}) -if(ENABLE_DAP) +if(NETCDF_ENABLE_DAP) target_link_libraries(ocprint netcdf ${ALL_TLL_LIBS}) -endif(ENABLE_DAP) +endif(NETCDF_ENABLE_DAP) #### # We have to do a little tweaking @@ -96,9 +96,9 @@ if(MSVC) setbinprops(nchdf5version) endif(USE_HDF5) - if(ENABLE_DAP) + if(NETCDF_ENABLE_DAP) setbinprops(ocprint) - endif(ENABLE_DAP) + endif(NETCDF_ENABLE_DAP) endif() @@ -331,11 +331,11 @@ endif(ENABLE_TESTS) # set_target_properties(ncvalidator # PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT" # ) -# IF(ENABLE_DAP) +# IF(NETCDF_ENABLE_DAP) # set_target_properties(ocprint # PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT" # ) -# ENDIF(ENABLE_DAP) +# ENDIF(NETCDF_ENABLE_DAP) #ENDIF() install(TARGETS ncdump RUNTIME DESTINATION bin COMPONENT utilities) diff --git a/ncdump/Makefile.am b/ncdump/Makefile.am index 8a4b4e048..0a68220d1 100644 --- a/ncdump/Makefile.am +++ b/ncdump/Makefile.am @@ -67,7 +67,7 @@ nchdf5version_SOURCES = nchdf5version.c endif # Conditionally build the ocprint program, but do not install -if ENABLE_DAP +if NETCDF_ENABLE_DAP bin_PROGRAMS += ocprint noinst_PROGRAMS += ocprint ocprint_SOURCES = ocprint.c