diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-09-19 20:30:22 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-09-19 20:30:22 (GMT) |
| commit | 5ac0b328c8de74c11afb7aad7a5305389c70adaa (patch) | |
| tree | 81bdef26f7c5a696fcacd5d824ef8abf97d80d2e /config/cmake/cacheinit.cmake | |
| parent | c15d93826b1fee98dfebc9903808a3b8a29e9512 (diff) | |
| parent | 2646f917adb5b2e17404260e433dc3ed7c39a602 (diff) | |
| download | hdf5-5ac0b328c8de74c11afb7aad7a5305389c70adaa.zip hdf5-5ac0b328c8de74c11afb7aad7a5305389c70adaa.tar.gz hdf5-5ac0b328c8de74c11afb7aad7a5305389c70adaa.tar.bz2 | |
Merge pull request #32 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:evict_on_close to evict_on_close
Sync with develop and cleaned up feature. Feature works with datasets but testing is minimal.
* commit '2646f917adb5b2e17404260e433dc3ed7c39a602': (102 commits)
Cleaned up feature for dissemination to LLNL: - Removed support for datatypes. - Commented out support for groups - General change clean-up - Added a list of improvements to BRANCH.txt
Removed blank line in Fortran file (leftover from last commit)
Reverted H5T code since datatypes will not be supported at this time.
Fixed format_convert and fortran files (bad merge?).
Updated manifest. Was missing BRANCH.txt.
Add missing command to set shared generated file
Add default site names
Separate fortran generation into static and shared folders.
Revert to using old set command
Change string to list - older usage
Add option to submit to Cdash
Change UPDATE_TYPE to git
Update CMake java functions
Added missing evict on close test file line to test/CMakeLists.txt.
Restrict git commit hash in tar file names to first 7 characters with --short option.
Add longer timeout to cache tests - test has consistently exceeded default timing.
Removed -p option from invocation of autogen.sh by h5vers script to allow running h5vers on machines without /usr/hdf/bin/AUTOTOOLS.
Add bin/pkgscrpts files to MANIFEST.
dd bin/pkgscrpts directory with scripts to package deployed unix binaries into tarfiles.
Purpose: Code cleanup Description: - Used FP_EPSILON in comparing float values to verify read data - Casted C macro to fix mismatched types in verify_val calls Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) Darwin (osx1010test)
...
Diffstat (limited to 'config/cmake/cacheinit.cmake')
| -rw-r--r-- | config/cmake/cacheinit.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 8e88aea..176547b 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -22,7 +22,7 @@ set (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE) set (HDF5_ENABLE_HSIZET ON CACHE BOOL "Enable datasets larger than memory" FORCE) -set (HDF5_ENABLE_UNSUPPORTED OFF CACHE BOOL "Enable unsupported combinations of configuration options" FORCE) +set (ALLOW_UNSUPPORTED OFF CACHE BOOL "Enable unsupported combinations of configuration options" FORCE) set (HDF5_ENABLE_DEPRECATED_SYMBOLS ON CACHE BOOL "Enable deprecated public API symbols" FORCE) @@ -56,7 +56,7 @@ set (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libr set (HDF5_NO_PACKAGES OFF CACHE BOOL "CPACK - Disable packaging" FORCE) -set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO SVN TGZ)" FORCE) +set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT SVN TGZ)" FORCE) set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO SVN TGZ) set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE) |