summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-09-29 20:57:47 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-09-29 20:57:47 (GMT)
commit41fe3ed5cc648d266116998e1b41aff420c5d758 (patch)
treefbde31f3a35de7fb46dd5e031f519dda403a648d
parent1733ea4780b0b4eecce5c9d7eb694c5e2b59d2d5 (diff)
downloadhdf5-41fe3ed5cc648d266116998e1b41aff420c5d758.zip
hdf5-41fe3ed5cc648d266116998e1b41aff420c5d758.tar.gz
hdf5-41fe3ed5cc648d266116998e1b41aff420c5d758.tar.bz2
[svn-r19495] Correct static external project library base names.
Tested: windows
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37820a8..01462dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -465,7 +465,7 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT)
)
ELSE (BUILD_SHARED_LIBS)
SET (ZLIB_LIBRARY
- "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}zlib${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libzlib${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
ENDIF (BUILD_SHARED_LIBS)
SET (ZLIB_INCLUDE_DIR_GEN
@@ -527,7 +527,7 @@ IF (HDF5_ENABLE_SZIP_SUPPORT)
)
ELSE (BUILD_SHARED_LIBS)
SET (SZIP_LIBRARY
- "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}szip${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libszip${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
ENDIF (BUILD_SHARED_LIBS)
SET (SZIP_INCLUDE_DIR_GEN