diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-23 15:40:48 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-23 15:40:48 (GMT) |
| commit | 718b311c110fa5895c0daccb6826525662de6d2c (patch) | |
| tree | da73efeedf8fe4d0b961b2da16b951531cfa8fc7 | |
| parent | 8572b0db32ee46cae646a799e26e0030528a19a2 (diff) | |
| parent | 342ab3ccbfc9808b2a3bd189d7ec9b467df27ca9 (diff) | |
| download | hdf5-718b311c110fa5895c0daccb6826525662de6d2c.zip hdf5-718b311c110fa5895c0daccb6826525662de6d2c.tar.gz hdf5-718b311c110fa5895c0daccb6826525662de6d2c.tar.bz2 | |
[svn-r27860] Description:
Sync w/changes on trunk
Tested on:
Not necessary, text only...
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rw-r--r-- | hl/tools/gif2h5/testfiles/README (renamed from hl/tools/gif2h5/testfiles/REAMDE) | 0 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 |
3 files changed, 11 insertions, 1 deletions
@@ -2347,7 +2347,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/REAMDE b/hl/tools/gif2h5/testfiles/README index a428d47..a428d47 100644 --- a/hl/tools/gif2h5/testfiles/REAMDE +++ b/hl/tools/gif2h5/testfiles/README diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79f47c7..ff69d5e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -884,6 +884,11 @@ set_target_properties (${HDF5_LIB_TARGET} PROPERTIES FOLDER libraries INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/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) @@ -912,6 +917,11 @@ if (BUILD_SHARED_LIBS) INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/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 |