[svn-r27859] Merged revisions

27625, 27627, 27647, 27648, 27661, 27668, 27670, 27671, 27674, 27676,
27703, 27716, 27720, 27747, 27754, 27755

from the trunk.

Mostly CMake and Fortran changes.

Tested on: jam (w/ gcc/gfortran 4.9.3)
This commit is contained in:
Dana Robinson
2015-09-22 15:44:16 -05:00
parent a2f7a8f34b
commit 8a170f1c61
93 changed files with 1133 additions and 686 deletions

View File

@@ -48,6 +48,8 @@ set (HDF5_USE_18_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.8.x API by default"
set (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)
set (HDF_TEST_EXPRESS "2" CACHE STRING "Control testing framework (0-3)" FORCE)
set (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)
set (HDF5_NO_PACKAGES OFF CACHE BOOL "CPACK - Disable packaging" FORCE)