From ab7b2c0fc04e2d2462818df23b0a7507d6e1679c Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 15 Nov 2011 11:58:10 -0500 Subject: [svn-r21761] HDFFV-7798: CMake on linux, building Static with zlib built internally. Corrected path component in EXTERNAL_ZLIB_LIBRARY macro. Tested: linux --- config/cmake/HDFMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v0.12