diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-02-29 00:27:00 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-02-29 00:27:00 (GMT) |
| commit | 8249dc6e3d45b58aa734c1269c4735922cb5a168 (patch) | |
| tree | a35fb122ef48436d1161dc2cbfffcb65e437990e /config/cmake | |
| parent | 594189a67300329207f21198a2606175acc4b89e (diff) | |
| parent | 8cd0b0aff8551345c84f75ea3c504a97cd87778b (diff) | |
| download | hdf5-8249dc6e3d45b58aa734c1269c4735922cb5a168.zip hdf5-8249dc6e3d45b58aa734c1269c4735922cb5a168.tar.gz hdf5-8249dc6e3d45b58aa734c1269c4735922cb5a168.tar.bz2 | |
[svn-r29224] Brought alpha2 branch in sync with revise_chunks (up to r29219)
Note: generated autotools files are from a VM and not THG
machines. These will be updated immediately after
check-in.
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial w/ Fortran & C++
autotools parallel (MPICH 3.1.4) w/ Fortran
CMake serial (cmakehdf5 w/ CMake 3.3.2)
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 9 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 4 | ||||
| -rw-r--r-- | config/cmake/vfdTest.cmake | 4 |
3 files changed, 2 insertions, 15 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 8bd6f45..49e9a05 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -6,15 +6,6 @@ include (${HDF_RESOURCES_EXT_DIR}/ConfigureChecks.cmake) include (${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake) #----------------------------------------------------------------------------- -# Option to Clear File Buffers before write --enable-clear-file-buffers -#----------------------------------------------------------------------------- -option (HDF5_Enable_Clear_File_Buffers "Securely clear file buffers before writing to file" ON) -if (HDF5_Enable_Clear_File_Buffers) - set (H5_CLEAR_MEMORY 1) -endif (HDF5_Enable_Clear_File_Buffers) -MARK_AS_ADVANCED (HDF5_Enable_Clear_File_Buffers) - -#----------------------------------------------------------------------------- # Option for --enable-strict-format-checks #----------------------------------------------------------------------------- option (HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks" OFF) diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index ce8219f..31c5afb 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -18,10 +18,6 @@ /* Define if building universal (internal helper macro) */ #cmakedefine H5_AC_APPLE_UNIVERSAL_BUILD @H5_AC_APPLE_UNIVERSAL_BUILD@ -/* Define if the memory buffers being written to disk should be cleared before - writing. */ -#cmakedefine H5_CLEAR_MEMORY @H5_CLEAR_MEMORY@ - /* Define if C++ compiler recognizes offsetof */ #cmakedefine H5_CXX_HAVE_OFFSETOF @H5_CXX_HAVE_OFFSETOF@ diff --git a/config/cmake/vfdTest.cmake b/config/cmake/vfdTest.cmake index 4685d88..10f0a7b 100644 --- a/config/cmake/vfdTest.cmake +++ b/config/cmake/vfdTest.cmake @@ -35,10 +35,10 @@ EXECUTE_PROCESS ( message (STATUS "COMMAND Result: ${TEST_RESULT}") -if (ERROR_APPEND) +if (ERROR_APPEND AND EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.err) file (READ ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.err TEST_STREAM) file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out "${TEST_STREAM}") -endif (ERROR_APPEND) +endif (ERROR_APPEND AND EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.err) # if the return value is !=${TEST_EXPECT} bail out if (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT}) |