mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fail configure if SZIP/ZLIB is requested but not found

Browse Source
This commit is contained in:
Allen Byrne 2019-02-05 15:25:30 -06:00
parent c7d04ee3af
commit 18e875f75f
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeFilters.cmake
View File

@ -27,7 +27,15 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT
set (TGZPATH ${HDF5_SOURCE_DIR})
endif ()
set (ZLIB_URL ${TGZPATH}/${ZLIB_TGZ_NAME})
if (NOT EXISTS "${ZLIB_URL}")
set (ZLIB_USE_EXTERNAL 0)
message (STATUS "Filter ZLIB file ${ZLIB_URL} not found")
endif ()
set (SZIP_URL ${TGZPATH}/${SZIP_TGZ_NAME})
if (NOT EXISTS "${SZIP_URL}")
set (SZIP_USE_EXTERNAL 0)
message (STATUS "Filter SZIP file ${SZIP_URL} not found")
endif ()
else ()
set (ZLIB_USE_EXTERNAL 0)
set (SZIP_USE_EXTERNAL 0)

6
config/cmake/scripts/HDF5config.cmake
View File

@ -43,6 +43,7 @@ set (CTEST_SOURCE_VERSEXT "")
#INSTALLDIR - HDF5-1.10.0 root folder
#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
#CTEST_SOURCE_NAME - name of source folder; HDF5-1.10.0
#MODEL - CDash group name
if (DEFINED CTEST_SCRIPT_ARG)
# transform ctest script arguments of the form
# script.ctest,var1=value1,var2=value2
@ -169,7 +170,10 @@ endif ()
###################################################################
######### Following is for submission to CDash ############
###################################################################
set (MODEL "Experimental")
if (NOT DEFINED MODEL)
set (MODEL "Experimental")
endif ()
###################################################################
###################################################################

6
tools/test/h5dump/h5dumpgentest.c
View File

@ -9529,15 +9529,13 @@ gent_intattrscalars(void)
}
/*-------------------------------------------------------------------------
* Function: gent_packedbits
* Function: gent_intsattrs
*
* Purpose: Generate a file to be used in the h5dump packed bits tests.
* Purpose: Generate a file to be used in the h5dump tests.
* Four datasets of 1, 2, 4 and 8 bytes of unsigned int types are created.
* Four more datasets of 1, 2, 4 and 8 bytes of signed int types are created.
* Fill them with raw data such that no bit will be all zero in a dataset.
* A dummy dataset of double type is created for failure test.
* Created: Albert Cheng, 2010/5/10.
* Modified: Allen Byrne, 2011/1/5 Use file to test Signed/Unsigned datatypes
*-------------------------------------------------------------------------
*/
static void