Skip to content

Add Findzstd.cmake; change Windows find_packages usage to use it too #4159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daym wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Findzstd.cmake; change Windows find_packages usage to use it too #4159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions cmake/modules/Findzstd.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# First, try the package's own config file
find_package(zstd CONFIG QUIET)

if(TARGET zstd::libzstd_shared)
set(zstd_FOUND TRUE)
return()
endif()

if(TARGET zstd::libzstd_static)
set(zstd_FOUND TRUE)
return()
endif()

# Fallback for systems without zstdConfig.cmake
find_path(ZSTD_INCLUDE_DIR zstd.h)
find_library(ZSTD_LIBRARY NAMES zstd)

if(ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY)
set(zstd_FOUND TRUE)
if(NOT TARGET zstd::libzstd_shared)
add_library(zstd::libzstd_shared UNKNOWN IMPORTED)
set_target_properties(
zstd::libzstd_shared
PROPERTIES IMPORTED_LOCATION \"${ZSTD_LIBRARY}\"
INTERFACE_INCLUDE_DIRECTORIES \"${ZSTD_INCLUDE_DIR}\"
)
endif()
if(NOT TARGET zstd::libzstd_static)
add_library(zstd::libzstd_static UNKNOWN IMPORTED)
set_target_properties(
zstd::libzstd_static
PROPERTIES IMPORTED_LOCATION \"${ZSTD_LIBRARY}\"
INTERFACE_INCLUDE_DIRECTORIES \"${ZSTD_INCLUDE_DIR}\"
)
endif()
endif()
2 changes: 1 addition & 1 deletion libmamba/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ macro(libmamba_create_target target_name linkage output_name)
find_library(LIBLZMA_LIBRARIES lzma REQUIRED)
find_library(LZ4_LIBRARY NAMES lz4)
find_library(LZO2_LIBRARY NAMES lzo2)
find_package(zstd CONFIG REQUIRED)
find_package(zstd REQUIRED)
find_library(BZIP2_LIBRARIES NAMES bz2)
find_library(CRYPTO_LIBRARIES NAMES libcrypto)

Expand Down
Loading