diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2011-12-20 16:38:34 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2011-12-20 16:38:34 (GMT) |
commit | eebe37ee4a38731215e84c0037960774857a338a (patch) | |
tree | ec651dc2ead9a67b081c0857215f8a7028a8731f | |
parent | a6d5efaf89527a1e1f7ac190e94ad2a06bd541b4 (diff) | |
download | hdf5-eebe37ee4a38731215e84c0037960774857a338a.zip hdf5-eebe37ee4a38731215e84c0037960774857a338a.tar.gz hdf5-eebe37ee4a38731215e84c0037960774857a338a.tar.bz2 |
[svn-r21836] Updated ext lib so version and lib packaging macros
Synch across projects
-rw-r--r-- | config/cmake/HDFLibMacros.cmake | 8 |
1 files 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") |