diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-10-14 20:17:58 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-10-14 20:17:58 (GMT) |
| commit | 8d04c682f4f1199b7f32308a52c5dd04bbb4d1ef (patch) | |
| tree | eedf44a5a777f6ab93354fac172b339f833aa1d3 | |
| parent | 1ae1dc8a319acfffb3a757ddeb08cade6ab6750b (diff) | |
| parent | 43affeb0f388466b5be555879d91d14037be0e99 (diff) | |
| download | hdf5-8d04c682f4f1199b7f32308a52c5dd04bbb4d1ef.zip hdf5-8d04c682f4f1199b7f32308a52c5dd04bbb4d1ef.tar.gz hdf5-8d04c682f4f1199b7f32308a52c5dd04bbb4d1ef.tar.bz2 | |
Merge pull request #78 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '43affeb0f388466b5be555879d91d14037be0e99':
Correct text - missing GIT option
Correct text - missing GIT option
Correct typo of variable format
| -rw-r--r-- | config/cmake/cacheinit.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/mccacheinit.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 176547b..24ae95c 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -57,7 +57,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 GIT SVN TGZ)" FORCE) -set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO SVN TGZ) +set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT SVN TGZ) set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE) diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake index b605f58..7dee5b5 100644 --- a/config/cmake/mccacheinit.cmake +++ b/config/cmake/mccacheinit.cmake @@ -66,8 +66,8 @@ set (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libr set (HDF5_NO_PACKAGES ON CACHE BOOL "CPACK - Disable packaging" FORCE) -set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO SVN TGZ)" FORCE) -set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO SVN TGZ) +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 GIT SVN TGZ) set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE) |