summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2018-09-25 20:05:47 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2018-09-25 20:05:47 (GMT)
commitab84c029c492ce8c9d3bac8e03bf07e760de9cd7 (patch)
tree3d7904fedbbf204fd7aa49eabe598e672de43f99
parent8e3b094bad1706b444554cd23591fd1c4431c1f1 (diff)
parent532a8df687e6acff18453fec6b8fe22f4bc65ebe (diff)
downloadhdf5-ab84c029c492ce8c9d3bac8e03bf07e760de9cd7.zip
hdf5-ab84c029c492ce8c9d3bac8e03bf07e760de9cd7.tar.gz
hdf5-ab84c029c492ce8c9d3bac8e03bf07e760de9cd7.tar.bz2
Merge pull request #1257 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '532a8df687e6acff18453fec6b8fe22f4bc65ebe': HDFFV-10531 document option for external libs
-rw-r--r--release_docs/INSTALL_CMake.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 2aa1f17..7352dae 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -275,9 +275,14 @@ IV. Further considerations
packages there. Add the following CMake options:
-DZLIB_LIBRARY:FILEPATH=some_location/lib/zlib.lib
-DZLIB_INCLUDE_DIR:PATH=some_location/include
+ -DZLIB_USE_EXTERNAL:BOOL=OFF
-DSZIP_LIBRARY:FILEPATH=some_location/lib/szlib.lib
-DSZIP_INCLUDE_DIR:PATH=some_location/include
+ -DSZIP_USE_EXTERNAL:BOOL=OFF
where "some_location" is the full path to the extlibs folder.
+ Also the appropriate environment variable must be set;
+ set(ENV{ZLIB_ROOT} "some_location")
+ set(ENV{SZIP_ROOT} "some_location")
B. Use source packages from an GIT server by adding the following CMake
options: