From 1cd606b5e0b48efa7fa3a1aac977ecb4f4ec04c5 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Tue, 22 Sep 2015 10:26:25 -0500 Subject: [svn-r27854] fixed typo in name of file --- MANIFEST | 2 +- hl/tools/gif2h5/testfiles/README | 6 ++++++ hl/tools/gif2h5/testfiles/REAMDE | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 hl/tools/gif2h5/testfiles/README delete mode 100644 hl/tools/gif2h5/testfiles/REAMDE diff --git a/MANIFEST b/MANIFEST index 634b733..1b6be22 100644 --- a/MANIFEST +++ b/MANIFEST @@ -2275,7 +2275,7 @@ ./hl/tools/gif2h5/writehdf.c ./hl/tools/gif2h5/h52gifgentst.c ./hl/tools/gif2h5/h52giftest.sh.in -./hl/tools/gif2h5/testfiles/REAMDE +./hl/tools/gif2h5/testfiles/README ./hl/tools/gif2h5/testfiles/ex_image2.h5 ./hl/tools/gif2h5/testfiles/image1.gif ./hl/tools/gif2h5/testfiles/h52giftst.h5 diff --git a/hl/tools/gif2h5/testfiles/README b/hl/tools/gif2h5/testfiles/README new file mode 100644 index 0000000..a428d47 --- /dev/null +++ b/hl/tools/gif2h5/testfiles/README @@ -0,0 +1,6 @@ +ex_image2.h5 + Generated by hl/examples/ex_image2.c +5giftst.h5: + Generated by ../h52gifgentst.c +image1.gif: + To be determined. diff --git a/hl/tools/gif2h5/testfiles/REAMDE b/hl/tools/gif2h5/testfiles/REAMDE deleted file mode 100644 index a428d47..0000000 --- a/hl/tools/gif2h5/testfiles/REAMDE +++ /dev/null @@ -1,6 +0,0 @@ -ex_image2.h5 - Generated by hl/examples/ex_image2.c -5giftst.h5: - Generated by ../h52gifgentst.c -image1.gif: - To be determined. -- cgit v0.12 From 342ab3ccbfc9808b2a3bd189d7ec9b467df27ca9 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 22 Sep 2015 15:01:39 -0500 Subject: [svn-r27858] Add depends for H5E files --- src/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index be0bf27..634b71c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -883,6 +883,11 @@ set_target_properties (${HDF5_LIB_TARGET} PROPERTIES FOLDER libraries INTERFACE_INCLUDE_DIRECTORIES "$/include>" ) +if (HDF5_GENERATE_HEADERS) + add_dependencies(${HDF5_LIB_TARGET} run_perl_scripts) +else (HDF5_GENERATE_HEADERS) + add_dependencies(${HDF5_LIB_TARGET} "${HDF5_SRC_DIR}/H5Edefin.h;${HDF5_SRC_DIR}/H5Einit.h;${HDF5_SRC_DIR}/H5Epubgen.h;${HDF5_SRC_DIR}/H5Eterm.h") +endif (HDF5_GENERATE_HEADERS) option (HDF5_ENABLE_DEBUG_APIS "Turn on debugging in all packages" OFF) if (HDF5_ENABLE_DEBUG_APIS) @@ -911,6 +916,11 @@ if (BUILD_SHARED_LIBS) INTERFACE_INCLUDE_DIRECTORIES "$/include>" INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB=1 ) + if (HDF5_GENERATE_HEADERS) + add_dependencies(${HDF5_LIBSH_TARGET} run_perl_scripts) + else (HDF5_GENERATE_HEADERS) + add_dependencies(${HDF5_LIBSH_TARGET} "${HDF5_SRC_DIR}/H5Edefin.h;${HDF5_SRC_DIR}/H5Einit.h;${HDF5_SRC_DIR}/H5Epubgen.h;${HDF5_SRC_DIR}/H5Eterm.h") + endif (HDF5_GENERATE_HEADERS) if (HDF5_ENABLE_THREADSAFE) set_property (TARGET ${HDF5_LIBSH_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS -- cgit v0.12