From 7540072fcb31bb6027fcdfbf2da6c6c3491aa0bc Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 20 Dec 2011 11:37:52 -0500 Subject: [svn-r21835] Updated ext lib so version and lib packaging macros Synch across projects --- config/cmake/HDFLibMacros.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/cmake/HDFLibMacros.cmake b/config/cmake/HDFLibMacros.cmake index c99bf04..a2ff110 100644 --- a/config/cmake/HDFLibMacros.cmake +++ b/config/cmake/HDFLibMacros.cmake @@ -159,8 +159,8 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding) ELSE (WIN32 AND NOT MINGW) SET_TARGET_PROPERTIES(szip PROPERTIES IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}" - IMPORTED_SONAME "${CMAKE_SHARED_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.2.1" - SOVERSION "2.1" + IMPORTED_SONAME "${CMAKE_SHARED_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${SZIP_VERSION_STRING}" + SOVERSION "${SZIP_VERSION_STRING}" ) ENDIF (WIN32 AND NOT MINGW) ELSE (${libtype} MATCHES "SHARED") @@ -261,8 +261,8 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype) ELSE (WIN32 AND NOT MINGW) SET_TARGET_PROPERTIES(zlib PROPERTIES IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}" - IMPORTED_SONAME "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1.2" - SOVERSION "1.2" + IMPORTED_SONAME "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${ZLIB_VERSION_STRING}" + SOVERSION "${ZLIB_VERSION_STRING}" ) ENDIF (WIN32 AND NOT MINGW) ELSE (${libtype} MATCHES "SHARED") -- cgit v0.12