From be50f4a4243afffa9668c9f41b0828ad1e2a1466 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 24 Feb 2011 06:57:56 -0500 Subject: [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. --- CMakeLists.txt | 12 ++++++------ 1 file 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 -- cgit v0.12