diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-08-26 15:38:35 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-08-26 15:38:35 (GMT) |
| commit | 35b226aadf602f65b65e87c31c06f19882791202 (patch) | |
| tree | 5c379fb79ff86618183348d1e6b70dc75468146d | |
| parent | c358e55cd7671c9c7c95d84f2e8fbcd1430286a0 (diff) | |
| download | hdf5-35b226aadf602f65b65e87c31c06f19882791202.zip hdf5-35b226aadf602f65b65e87c31c06f19882791202.tar.gz hdf5-35b226aadf602f65b65e87c31c06f19882791202.tar.bz2 | |
[svn-r21317] Correct zlib references, zlib svn no longer has src folder
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 2 | ||||
| -rwxr-xr-x | release_docs/CMake.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index 36f0a2b..e311277 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -268,7 +268,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype) SET (ZLIB_LIBRARY "zlib") SET (ZLIB_INCLUDE_DIR_GEN "${BINARY_DIR}") - SET (ZLIB_INCLUDE_DIR "${SOURCE_DIR}/src") + SET (ZLIB_INCLUDE_DIR "${SOURCE_DIR}") SET (ZLIB_FOUND 1) SET (ZLIB_LIBRARIES ${ZLIB_LIBRARY}) SET (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR_GEN} ${ZLIB_INCLUDE_DIR}) diff --git a/release_docs/CMake.txt b/release_docs/CMake.txt index 44a9d28..6ee7243 100755 --- a/release_docs/CMake.txt +++ b/release_docs/CMake.txt @@ -105,8 +105,8 @@ Notes: This short instruction is written for users who want to quickly build <options> is: * SZIP_INCLUDE_DIR:PATH=<path to szip includes directory> * SZIP_LIBRARY:FILEPATH=<path to szip/library file> - * ZLIB_INCLUDE_DIR:PATH=<path to szip includes directory> - * ZLIB_LIBRARY:FILEPATH=<path to szip/library file> + * ZLIB_INCLUDE_DIR:PATH=<path to zlib includes directory> + * ZLIB_LIBRARY:FILEPATH=<path to zlib/library file> * <HDF5OPTION>:BOOL=[ON | OFF] <cacheinit.cmake> is: |