diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-08 05:10:35 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-08 05:10:35 (GMT) |
commit | b0cfc6ed76b6f48275196591c52637aecdfc9920 (patch) | |
tree | 12fb162fc6c8525e3aad009a10d9d212159c3a26 /config/cmake | |
parent | c3ad0376099f3ab9c688eb56f243d48ec90a39c3 (diff) | |
download | hdf5-b0cfc6ed76b6f48275196591c52637aecdfc9920.zip hdf5-b0cfc6ed76b6f48275196591c52637aecdfc9920.tar.gz hdf5-b0cfc6ed76b6f48275196591c52637aecdfc9920.tar.bz2 |
[svn-r29335] Merge of r29292, 29301, 29306, 29307, 29312, 29314, 29322, 29325
from trunk.
C++ and a few misc changes.
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial w/ C++ and Fortran
bin/cmakehdf5 w/ C++ and Fortran
Diffstat (limited to 'config/cmake')
-rw-r--r-- | config/cmake/mccacheinit.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake index e54db1f..2bebcf2 100644 --- a/config/cmake/mccacheinit.cmake +++ b/config/cmake/mccacheinit.cmake @@ -6,6 +6,8 @@ set (CMAKE_INSTALL_FRAMEWORK_PREFIX "Library/Frameworks" CACHE STRING "Frameworks installation directory" FORCE) +set (HDF5_GENERATE_HEADERS ON CACHE BOOL "Rebuild Generated Files" FORCE) + set (BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libraries" FORCE) set (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE) |