diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-12 20:42:49 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-17 16:58:03 (GMT) |
| commit | 7ba562a82017779829394d5a5e03b62e69d6c926 (patch) | |
| tree | ac5de2ce6f506844db708394297394fb143bcd71 /tools | |
| parent | d586a457b2c3d0377b8752a6ce9b621a5994f56e (diff) | |
| download | hdf5-7ba562a82017779829394d5a5e03b62e69d6c926.zip hdf5-7ba562a82017779829394d5a5e03b62e69d6c926.tar.gz hdf5-7ba562a82017779829394d5a5e03b62e69d6c926.tar.bz2 | |
HDFFV-10845 fix configure check and PATHs
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/src/misc/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tools/test/h5dump/CMakeTests.cmake | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/tools/src/misc/CMakeLists.txt b/tools/src/misc/CMakeLists.txt index 7c3d7f0..6b41d7f 100644 --- a/tools/src/misc/CMakeLists.txt +++ b/tools/src/misc/CMakeLists.txt @@ -78,13 +78,6 @@ if (BUILD_SHARED_LIBS) ) endif () -#----------------------------------------------------------------------------- -# Generate the h5cc file containing settings needed to compile programs -#----------------------------------------------------------------------------- -#if (NOT WIN32) -# configure_file (${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5cc.in ${HDF5_BINARY_DIR}/h5cc @ONLY) -#endif () - ############################################################################## ############################################################################## ### I N S T A L L A T I O N ### diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake index 070e98e..db47111 100644 --- a/tools/test/h5dump/CMakeTests.cmake +++ b/tools/test/h5dump/CMakeTests.cmake @@ -362,7 +362,7 @@ endforeach () foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES}) - if (WIN32) + if (WIN32 OR MINGW) file (READ ${HDF5_TOOLS_DIR}/testfiles/${tst_exp_file} TEST_STREAM) file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file} "${TEST_STREAM}") else () @@ -388,7 +388,7 @@ # -------------------------------------------------------------------- HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files") - if (WIN32) + if (WIN32 OR MINGW) file (READ ${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp TEST_STREAM) file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}") else () |