ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake : SHARED_LIBRARY_OUTPUT_NAME is user-selectable, by @aparamon (#469)

Browse Source
This commit is contained in:
Yann Collet
2016-12-06 13:45:42 -08:00
parent 94d1a93d28
commit 1628fe08fc
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/cmake/lib/CMakeLists.txt
+8 -8
View File
@@ -130,20 +130,20 @@ ELSE ()
SET(LIBRARY_BASE_NAME libzstd) SET(LIBRARY_BASE_NAME libzstd)
ENDIF (MSVC) ENDIF (MSVC)
# Define static and shared library names
SET(STATIC_LIBRARY_OUTPUT_NAME ${LIBRARY_BASE_NAME})
SET(SHARED_LIBRARY_OUTPUT_NAME ${LIBRARY_BASE_NAME}.${LIBVER_MAJOR}.${LIBVER_MINOR}.${LIBVER_RELEASE})
IF (MSVC) IF (MSVC)
IF (CMAKE_SIZEOF_VOID_P MATCHES "8") IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
SET(STATIC_LIBRARY_OUTPUT_NAME ${STATIC_LIBRARY_OUTPUT_NAME}_x64) SET(LIBRARY_ARCH_SUFFIX "_x64")
SET(SHARED_LIBRARY_OUTPUT_NAME ${SHARED_LIBRARY_OUTPUT_NAME}_x64)
ELSE () ELSE ()
SET(STATIC_LIBRARY_OUTPUT_NAME ${STATIC_LIBRARY_OUTPUT_NAME}_x86) SET(LIBRARY_ARCH_SUFFIX "_x86")
SET(SHARED_LIBRARY_OUTPUT_NAME ${SHARED_LIBRARY_OUTPUT_NAME}_x86)
ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
ELSE ()
SET(LIBRARY_ARCH_SUFFIX "")
ENDIF (MSVC) ENDIF (MSVC)
# Define static and shared library names
SET(STATIC_LIBRARY_OUTPUT_NAME ${LIBRARY_BASE_NAME}${LIBRARY_ARCH_SUFFIX} CACHE STRING "Static library output name")
SET(SHARED_LIBRARY_OUTPUT_NAME ${LIBRARY_BASE_NAME}.${LIBVER_MAJOR}.${LIBVER_MINOR}.${LIBVER_RELEASE}${LIBRARY_ARCH_SUFFIX} CACHE STRING "Shared library output name")
SET_TARGET_PROPERTIES( SET_TARGET_PROPERTIES(
libzstd_static libzstd_static
PROPERTIES PROPERTIES