Merge branch 'master' into big_var_on_32bit

This commit is contained in:
Ward Fisher 2018-01-31 10:44:09 -07:00 committed by GitHub
commit 56190a716d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions

11
examples/C/hdf5plugins/.gitignore vendored Normal file
View File

@ -0,0 +1,11 @@
H5Zbzip2.c
blocksort.c
bzlib.c
bzlib.h
bzlib_private.h
compress.c
crctable.c
decompress.c
h5bzip2.h
huffman.c
randtable.c

View File

@ -21,12 +21,6 @@ SET_TARGET_PROPERTIES(bzip2 PROPERTIES ARCHIVE_OUTPUT_NAME "bzip2")
SET_TARGET_PROPERTIES(bzip2 PROPERTIES RUNTIME_OUTPUT_NAME "bzip2") SET_TARGET_PROPERTIES(bzip2 PROPERTIES RUNTIME_OUTPUT_NAME "bzip2")
TARGET_LINK_LIBRARIES(bzip2 ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES}) TARGET_LINK_LIBRARIES(bzip2 ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES})
ADD_LIBRARY(misc MODULE ${libmisc_SOURCES})
SET_TARGET_PROPERTIES(misc PROPERTIES LIBRARY_OUTPUT_NAME "misc")
SET_TARGET_PROPERTIES(misc PROPERTIES ARCHIVE_OUTPUT_NAME "misc")
SET_TARGET_PROPERTIES(misc PROPERTIES RUNTIME_OUTPUT_NAME "misc")
TARGET_LINK_LIBRARIES(misc ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES})
ENDIF(BUILD_UTILITIES) ENDIF(BUILD_UTILITIES)
ENDIF(ENABLE_FILTER_TESTING) ENDIF(ENABLE_FILTER_TESTING)