Merge pull request #2947 from MehdiChinoune/patch-1

Fix zstd-static output name with MINGW/Clang
This commit is contained in:
Yann Collet 2021-12-22 11:13:40 -08:00 committed by GitHub
commit eebf24bd2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -106,7 +106,7 @@ if (MSVC)
endif () endif ()
# With MSVC static library needs to be renamed to avoid conflict with import library # With MSVC static library needs to be renamed to avoid conflict with import library
if (MSVC OR (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")) if (MSVC OR (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW))
set(STATIC_LIBRARY_BASE_NAME zstd_static) set(STATIC_LIBRARY_BASE_NAME zstd_static)
else () else ()
set(STATIC_LIBRARY_BASE_NAME zstd) set(STATIC_LIBRARY_BASE_NAME zstd)