diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-22 00:35:47 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-22 00:35:47 (GMT) |
| commit | 4ad84456b3a44db81bd8045bfb5e09471cfc3ba3 (patch) | |
| tree | 28eee58e7bf3c7ff5807728fba6bd24b1b282e4c /src | |
| parent | d3c6b4ad7244f46c863d47f630e1c9b0427abed5 (diff) | |
| parent | fb238c24a5c6679c7555c95f887b7f4a49dbb640 (diff) | |
| download | hdf5-4ad84456b3a44db81bd8045bfb5e09471cfc3ba3.zip hdf5-4ad84456b3a44db81bd8045bfb5e09471cfc3ba3.tar.gz hdf5-4ad84456b3a44db81bd8045bfb5e09471cfc3ba3.tar.bz2 | |
[svn-r27850] Description:
Sync w/trunk
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial
(h5committest not required on this branch)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/H5Sselect.c | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fce59c2..79f47c7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -777,6 +777,8 @@ set (H5_GENERATED_HEADERS ${HDF5_SRC_DIR}/H5overflow.h ) +option (HDF5_GENERATE_HEADERS "Rebuild Generated Files" ON) +mark_as_advanced (HDF5_GENERATE_HEADERS) if (HDF5_GENERATE_HEADERS) find_package (Perl) if (PERL_FOUND) @@ -827,7 +829,11 @@ TARGET_C_PROPERTIES (H5detect STATIC " " " ") if (MSVC OR MINGW) target_link_libraries (H5detect "ws2_32.lib") endif (MSVC OR MINGW) -add_dependencies(H5detect generate_precompiled) +if (HDF5_GENERATE_HEADERS) + add_dependencies(H5detect generate_precompiled) +else (HDF5_GENERATE_HEADERS) + add_dependencies(H5detect "${HDF5_SRC_DIR}/H5version.h;${HDF5_SRC_DIR}/H5overflow.h") +endif (HDF5_GENERATE_HEADERS) set (CMD $<TARGET_FILE:H5detect>) add_custom_command ( @@ -842,7 +848,11 @@ TARGET_C_PROPERTIES (H5make_libsettings STATIC " " " ") if (MSVC OR MINGW) target_link_libraries (H5make_libsettings "ws2_32.lib") endif (MSVC OR MINGW) -add_dependencies(H5make_libsettings generate_precompiled) +if (HDF5_GENERATE_HEADERS) + add_dependencies(H5detect generate_precompiled) +else (HDF5_GENERATE_HEADERS) + add_dependencies(H5make_libsettings "${HDF5_SRC_DIR}/H5version.h;${HDF5_SRC_DIR}/H5overflow.h") +endif (HDF5_GENERATE_HEADERS) set (CMD $<TARGET_FILE:H5make_libsettings>) add_custom_command ( diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 11267b6..d66a30a 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -713,7 +713,7 @@ H5S_get_select_offset(const H5S_t *space, hsize_t *offset) int H5S_get_select_unlim_dim(const H5S_t *space) { - herr_t ret_value; /* return value */ + herr_t ret_value = FAIL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR |