diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-02-24 11:58:24 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-02-24 11:58:24 (GMT) |
| commit | 3d75165304907c5de3372497d1e19c97df1498ab (patch) | |
| tree | 6696876b03f4a8d83672d771f7f80bcd644159c3 /CMakeLists.txt | |
| parent | ace309a7028e01e329c26c3f15df7ed2ca453912 (diff) | |
| download | hdf5-3d75165304907c5de3372497d1e19c97df1498ab.zip hdf5-3d75165304907c5de3372497d1e19c97df1498ab.tar.gz hdf5-3d75165304907c5de3372497d1e19c97df1498ab.tar.bz2 | |
[svn-r20152] On windows the name of static zlib library is dependent on the use of HDF_LEGACY_NAMING value when built from SVN/TGZ source.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 33c391c..39659e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -518,13 +518,13 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT) ENDIF (WIN32 AND NOT MINGW) ELSE (BUILD_SHARED_LIBS) IF (WIN32 AND NOT MINGW) - SET (ZLIB_LIBRARY - "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/zlib${CMAKE_STATIC_LIBRARY_SUFFIX}" - ) + IF (HDF_LEGACY_NAMING) + SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/zlib${CMAKE_STATIC_LIBRARY_SUFFIX}") + ELSE (HDF_LEGACY_NAMING) + SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libzlib${CMAKE_STATIC_LIBRARY_SUFFIX}") + ENDIF (HDF_LEGACY_NAMING) ELSE (WIN32 AND NOT MINGW) - SET (ZLIB_LIBRARY - "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libz${CMAKE_STATIC_LIBRARY_SUFFIX}" - ) + SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libz${CMAKE_STATIC_LIBRARY_SUFFIX}") ENDIF (WIN32 AND NOT MINGW) ENDIF (BUILD_SHARED_LIBS) SET (ZLIB_INCLUDE_DIR_GEN |