summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-11-15 16:58:10 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-11-15 16:58:10 (GMT)
commitab7b2c0fc04e2d2462818df23b0a7507d6e1679c (patch)
tree256a091623016c61cb6cc2a4bf1d860a8156ccbf
parentb3768963e12767519ebda3884162cb8e4b9fad80 (diff)
downloadhdf5-ab7b2c0fc04e2d2462818df23b0a7507d6e1679c.zip
hdf5-ab7b2c0fc04e2d2462818df23b0a7507d6e1679c.tar.gz
hdf5-ab7b2c0fc04e2d2462818df23b0a7507d6e1679c.tar.bz2
[svn-r21761] HDFFV-7798: CMake on linux, building Static with zlib built internally. Corrected path component in EXTERNAL_ZLIB_LIBRARY macro.
Tested: linux
-rw-r--r--config/cmake/HDFMacros.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index f58b86e..d864e84 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -251,7 +251,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
)
ELSE (WIN32 AND NOT MINGW)
SET_TARGET_PROPERTIES(zlib PROPERTIES
- IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/libz${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libz${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}"
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
)
ENDIF (WIN32 AND NOT MINGW)