diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-11-12 12:27:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 12:27:05 (GMT) |
| commit | aab84e704d10c15e8e759d75f809158c1923b6d5 (patch) | |
| tree | ae2a45ea492075ce66be8d24f196817c57ab0790 /config | |
| parent | 1ce4c8dd7ddaa344ad041514b1d3aa4979497275 (diff) | |
| parent | 05a7b2523b47d34f921602d6968f2ad3053df873 (diff) | |
| download | hdf5-aab84e704d10c15e8e759d75f809158c1923b6d5.zip hdf5-aab84e704d10c15e8e759d75f809158c1923b6d5.tar.gz hdf5-aab84e704d10c15e8e759d75f809158c1923b6d5.tar.bz2 | |
Merge pull request #38 from byrnHDF/hdf5_1_8
Reduce code differences between HDF5 1.8 and 1.10
Diffstat (limited to 'config')
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/scripts/HDF5options.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index e3bfb77..7ba359a 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -204,7 +204,7 @@ endif () #set (LOCAL_NO_PACKAGE "TRUE") ##### Following controls source update ##### #set (LOCAL_UPDATE "TRUE") -set (REPOSITORY_URL "https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git") +set (REPOSITORY_URL "https://github.com/HDFGroup/hdf5.git") set (REPOSITORY_BRANCH "hdf5_1_8") #uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake index dbb81a4..ee3f210 100644 --- a/config/cmake/scripts/HDF5options.cmake +++ b/config/cmake/scripts/HDF5options.cmake @@ -55,7 +55,9 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=GIT") ### ext libs on system #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=NO") +#set(ENV{ZLIB_ROOT} "some_location") #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_LIBRARY:FILEPATH=some_location/lib/zlib.lib -DZLIB_INCLUDE_DIR:PATH=some_location/include") +#set(ENV{SZIP_ROOT} "some_location") #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSZIP_LIBRARY:FILEPATH=some_location/lib/szlib.lib -DSZIP_INCLUDE_DIR:PATH=some_location/include") ### disable using ext zlib |