summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-10-20 22:50:49 (GMT)
committerGitHub <noreply@github.com>2020-10-20 22:50:49 (GMT)
commit8f15ee5e3c449782fb34059b4da68eabdadb271b (patch)
treee493896599e0ea5d8cbefdc60dcc6b06cfba0fb5
parent377a5ab2e55b2675cf355ad218e84376cb5f7678 (diff)
parent4a88f0c8d780c27aa611edbf3562b0264fd8b97f (diff)
downloadhdf5-8f15ee5e3c449782fb34059b4da68eabdadb271b.zip
hdf5-8f15ee5e3c449782fb34059b4da68eabdadb271b.tar.gz
hdf5-8f15ee5e3c449782fb34059b4da68eabdadb271b.tar.bz2
Merge pull request #49 from byrnHDF/develop
options corrections
-rw-r--r--config/cmake/scripts/HDF5options.cmake2
-rw-r--r--release_docs/INSTALL2
2 files changed, 3 insertions, 1 deletions
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index f132234..33ec74b 100644
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -57,7 +57,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
diff --git a/release_docs/INSTALL b/release_docs/INSTALL
index d1addc9..9546615 100644
--- a/release_docs/INSTALL
+++ b/release_docs/INSTALL
@@ -354,7 +354,7 @@ CONTENTS
`--enable-build-mode=debug'; to compile with optimizations
(the default for supported public releases),
say `--enable-build-mode=production'. For a 'clean slate' configuration
- with optimization disabled and nothing turned on,
+ with optimization disabled and nothing turned on,
say `--enable-build-mode=clean'. On some systems the
library can also be compiled for profiling with gprof by saying
`--enable-profiling'.