Merge https://github.com/facebook/zstd into dev

2021-12-01 22:41:24 +08:00
parent d4713de5a3 bf0a74663e
commit c2260c1d45
1 changed files with 1 additions and 1 deletions
@@ -106,7 +106,7 @@ if (MSVC)
 endif ()

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