Skip to content

F
folly
Commit 87f1a403 authored by myd7349's avatar myd7349 Committed by Facebook Github Bot
Browse files
Options

Take care of zstd static library on Win32 (#1120) 

Summary:
When built as a static library on Win32, `zstd` has an output name like `zstd_static.lib` and `zstd_staticd.lib`:
https://github.com/facebook/zstd/blob/69baaee3e42f90dedea2c946bc19bfeac4e782ee/build/cmake/lib/CMakeLists.txt#L140
So `FindZstd.cmake` should also take this into consideration.
Pull Request resolved: https://github.com/facebook/folly/pull/1120

Reviewed By: yfeldblum

Differential Revision: D15149814

Pulled By: Orvid

fbshipit-source-id: 298809a524468ab5aa68e58f5fef0cbb0f366051
parent 3fb4ba1d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
CMake/FindZstd.cmake
View file @ 87f1a403
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
find_path(ZSTD_INCLUDE_DIR NAMES zstd.h) find_path(ZSTD_INCLUDE_DIR NAMES zstd.h)
find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd) find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd zstd_staticd)
find_library(ZSTD_LIBRARY_RELEASE NAMES zstd) find_library(ZSTD_LIBRARY_RELEASE NAMES zstd zstd_static)
include(SelectLibraryConfigurations) include(SelectLibraryConfigurations)
SELECT_LIBRARY_CONFIGURATIONS(ZSTD) SELECT_LIBRARY_CONFIGURATIONS(ZSTD)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment