Skip to content

Commit

Permalink
Merge pull request #2947 from MehdiChinoune/patch-1
Browse files Browse the repository at this point in the history
Fix zstd-static output name with MINGW/Clang
  • Loading branch information
Cyan4973 authored Dec 22, 2021
2 parents 4115307 + 14a0eaf commit eebf24b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/cmake/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ if (MSVC)
endif ()

# 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)
else ()
set(STATIC_LIBRARY_BASE_NAME zstd)
Expand Down

0 comments on commit eebf24b

Please sign in to comment.