summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2017-04-27 20:07:57 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2017-04-27 20:07:57 (GMT)
commit09882f7ccd7c175c97572fb81f94571c34539931 (patch)
treeb76cd774a22205115cbaed72e8d26bf044a31974 /config
parentc2729b6ad13170d7311848ecba2483515e113825 (diff)
parent80d57c242a15edd983673e9bad4e966c72975289 (diff)
downloadhdf5-09882f7ccd7c175c97572fb81f94571c34539931.zip
hdf5-09882f7ccd7c175c97572fb81f94571c34539931.tar.gz
hdf5-09882f7ccd7c175c97572fb81f94571c34539931.tar.bz2
Merge pull request #480 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:cmake_header_create to develop
* commit '80d57c242a15edd983673e9bad4e966c72975289': Set the HDF5_GENERATE_HEADERS CMake option to default to ON and removed the option from the CMake cache init files.
Diffstat (limited to 'config')
-rw-r--r--config/cmake/cacheinit.cmake2
-rw-r--r--config/cmake/mccacheinit.cmake2
2 files changed, 0 insertions, 4 deletions
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index c923283..6a66c8a 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -17,8 +17,6 @@
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 (HDF_PACKAGE_EXT "" CACHE STRING "Name of HDF package extension" FORCE)
set (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE)
diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake
index 1f60a01..3f0dd4f 100644
--- a/config/cmake/mccacheinit.cmake
+++ b/config/cmake/mccacheinit.cmake
@@ -17,8 +17,6 @@
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)