summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-02-24 11:57:56 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-02-24 11:57:56 (GMT)
commitbe50f4a4243afffa9668c9f41b0828ad1e2a1466 (patch)
tree2426c3e85e117688658d2757496d48f128c6c630
parent85304e9fee5b8b24050a4f1d145de62234ff10a4 (diff)
downloadhdf5-be50f4a4243afffa9668c9f41b0828ad1e2a1466.zip
hdf5-be50f4a4243afffa9668c9f41b0828ad1e2a1466.tar.gz
hdf5-be50f4a4243afffa9668c9f41b0828ad1e2a1466.tar.bz2
[svn-r20151] On windows the name of static zlib library is dependent on the use of HDF_LEGACY_NAMING value when built from SVN/TGZ source.
-rw-r--r--CMakeLists.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06ef526..bd1c334 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -516,13 +516,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