mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-05 16:20:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed accidental changes

Browse Source
This commit is contained in:
Ed Hartnett 2017-11-20 05:39:10 -07:00
parent 5b19a2b861
commit 4d907a028f
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -689,11 +689,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_deflate "" HAVE_H5PSET_DEFLATE) CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_deflate "" HAVE_H5PSET_DEFLATE)
#Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip. #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip.
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP) CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5P_SZIP "" USE_SZIP)
IF(USE_SZIP) IF(USE_SZIP)
FIND_LIBRARY(SZIP NAMES sz szip) FIND_LIBRARY(SZIP NAMES szip sz)
IF(SZIP) IF(SZIP)
SET(HAVE_H5Z_SZIP 1)
SET(SZIP_LIBRARY ${SZIP}) SET(SZIP_LIBRARY ${SZIP})
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP}) SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP})
ELSE() ELSE()

45
ncdump/CMakeLists.txt
View File

@ -3,6 +3,22 @@ IF(BUILD_SHARED_LIBS AND WIN32)
remove_definitions(-DDLL_NETCDF) remove_definitions(-DDLL_NETCDF)
ENDIF() ENDIF()
# These generate some files used in ncdump testing
# Specifically, they generate ctest0.nc ctest0_64.nc
# Before, these .nc files were placed in the same place as the
# .c file: namely build/ncdump.
# This complicates the shell tests that use it.
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CONFIG_TYPE}/ctest.c
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/ref_ctest.c"
"${CMAKE_CURRENT_BINARY_DIR}/ctest.c"
)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ctest64.c
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/ref_ctest64.c"
"${CMAKE_CURRENT_BINARY_DIR}/ctest64.c"
)
SET(ncdump_FILES ncdump.c vardata.c dumplib.c indent.c nctime0.c utils.c nciter.c) SET(ncdump_FILES ncdump.c vardata.c dumplib.c indent.c nctime0.c utils.c nciter.c)
SET(nccopy_FILES nccopy.c nciter.c chunkspec.c utils.c dimmap.c) SET(nccopy_FILES nccopy.c nciter.c chunkspec.c utils.c dimmap.c)
@ -102,9 +118,8 @@ ENDIF()
## Start adding tests in the appropriate order ## Start adding tests in the appropriate order
add_sh_test(ncdump run_tests) add_sh_test(ncdump run_tests)
add_sh_test(ncdump tst_64bit) add_sh_test(ncdump tst_64bit)
add_bin_test_no_prefix(ref_ctest) add_bin_test(ncdump ctest)
add_bin_test_no_prefix(ref_ctest64) add_bin_test(ncdump ctest64)
add_sh_test(ncdump tst_ctest)
add_sh_test(ncdump tst_output) add_sh_test(ncdump tst_output)
add_sh_test(ncdump tst_lengths) add_sh_test(ncdump tst_lengths)
add_sh_test(ncdump tst_calendars) add_sh_test(ncdump tst_calendars)
@ -140,17 +155,17 @@ ENDIF()
ENDIF(BUILD_DISKLESS) ENDIF(BUILD_DISKLESS)
IF(USE_NETCDF4) IF(USE_NETCDF4)
add_bin_test_no_prefix(tst_create_files) add_bin_test(ncdump tst_create_files)
add_bin_test_no_prefix(tst_group_data) add_bin_test(ncdump tst_group_data)
add_bin_test_no_prefix(tst_enum_data) add_bin_test(ncdump tst_enum_data)
add_bin_test_no_prefix(tst_opaque_data) add_bin_test(ncdump tst_opaque_data)
add_bin_test_no_prefix(tst_string_data) add_bin_test(ncdump tst_string_data)
add_bin_test_no_prefix(tst_vlen_data) add_bin_test(ncdump tst_vlen_data)
add_bin_test_no_prefix(tst_comp) add_bin_test(ncdump tst_comp)
add_bin_test_no_prefix(tst_comp2) add_bin_test(ncdump tst_comp2)
add_bin_test_no_prefix(tst_nans) add_bin_test(ncdump tst_nans)
add_bin_test_no_prefix(tst_h_scalar) add_bin_test(ncdump tst_h_scalar)
add_bin_test_no_prefix(tst_bug324) add_bin_test(ncdump tst_bug324)
add_sh_test(ncdump tst_formatx4) add_sh_test(ncdump tst_formatx4)
# Add this test by hand, as it is also called from a script. # Add this test by hand, as it is also called from a script.
# Editing the script would break autotools compatibility. # Editing the script would break autotools compatibility.
@ -172,7 +187,7 @@ ENDIF()
# is different, but the result is actually correct. # is different, but the result is actually correct.
#IF(NOT MSVC) #IF(NOT MSVC)
add_sh_test(ncdump tst_netcdf4) add_sh_test(ncdump tst_netcdf4)
add_bin_test_no_prefix(tst_h_rdc0) add_bin_test(ncdump tst_h_rdc0)
#ENDIF() #ENDIF()
add_bin_test(ncdump tst_unicode) add_bin_test(ncdump tst_unicode)