Skip to content

Commit fc6a8ca

Browse files
authored
Merge pull request #2 from Unidata/master
sync
2 parents ee4a3b6 + b7de06a commit fc6a8ca

File tree

19 files changed

+32
-5405
lines changed

19 files changed

+32
-5405
lines changed

cf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ FLAGS="$FLAGS --enable-logging"
117117
#FLAGS="$FLAGS --disable-properties-attribute"
118118
#FLAGS="$FLAGS --disable-silent-rules"
119119
#FLAGS="$FLAGS --with-testservers=remotestserver.localhost:8083"
120-
#FLAGS="$FLAGS --disable-filter-testing"
120+
FLAGS="$FLAGS --enable-filter-testing"
121121

122122
if test "x$PAR4" != x1 ; then
123123
FLAGS="$FLAGS --disable-parallel4"

cf.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ FLAGS="$FLAGS -DENABLE_EXAMPLES=false"
4444
FLAGS="$FLAGS -DENABLE_DYNAMIC_LOADING=false"
4545
FLAGS="$FLAGS -DENABLE_WINSOCK2=false"
4646
#FLAGS="$FLAGS -DENABLE_LARGE_FILE_TESTS=true"
47+
FLAGS="$FLAGS -DENABLE_FILTER_TESTING=true"
4748

4849
rm -fr build
4950
mkdir build

examples/C/hdf5plugins/.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
H5Zbzip2.c
2+
blocksort.c
3+
bzlib.c
4+
bzlib.h
5+
bzlib_private.h
6+
compress.c
7+
crctable.c
8+
decompress.c
9+
h5bzip2.h
10+
huffman.c
11+
randtable.c

examples/C/hdf5plugins/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ SET_TARGET_PROPERTIES(bzip2 PROPERTIES ARCHIVE_OUTPUT_NAME "bzip2")
2121
SET_TARGET_PROPERTIES(bzip2 PROPERTIES RUNTIME_OUTPUT_NAME "bzip2")
2222
TARGET_LINK_LIBRARIES(bzip2 ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES})
2323

24-
ADD_LIBRARY(misc MODULE ${libmisc_SOURCES})
25-
SET_TARGET_PROPERTIES(misc PROPERTIES LIBRARY_OUTPUT_NAME "misc")
26-
SET_TARGET_PROPERTIES(misc PROPERTIES ARCHIVE_OUTPUT_NAME "misc")
27-
SET_TARGET_PROPERTIES(misc PROPERTIES RUNTIME_OUTPUT_NAME "misc")
28-
TARGET_LINK_LIBRARIES(misc ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES})
29-
3024
ENDIF(BUILD_UTILITIES)
3125
ENDIF(ENABLE_FILTER_TESTING)
3226

examples/C/hdf5plugins/H5Zbzip2.c

Lines changed: 0 additions & 181 deletions
This file was deleted.

0 commit comments

Comments
 (0)