Skip to content

fix build: change zstd and yaml-cpp in Find*.cmake to be compatible … #1176

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
botanegg wants to merge 1 commit into
base: develop
Choose a base branch
from
+9 −5
Open

fix build: change zstd and yaml-cpp in Find*.cmake to be compatible … #1176

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
2 changes: 1 addition & 1 deletion cmake/SetupRdKafka.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if(NOT USERVER_FORCE_DOWNLOAD_PACKAGES)
OpenSSL::SSL
OpenSSL::Crypto
SASL2::SASL2
zstd::zstd
zstd::libzstd
)
return()
endif()
Expand Down
4 changes: 4 additions & 0 deletions cmake/modules/Findyaml-cpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ _userver_module_find_include(NAMES yaml-cpp/yaml.h yaml-cpp/node.h PATH_SUFFIXES
_userver_module_find_library(NAMES yaml-cpp PATH_SUFFIXES lib)

_userver_module_end()

if(NOT TARGET yaml-cpp::yaml-cpp)
add_library(yaml-cpp::yaml-cpp ALIAS yaml-cpp)
endif()
6 changes: 3 additions & 3 deletions cmake/modules/Findzstd.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ _userver_module_find_library(NAMES zstd PATH_SUFFIXES lib)

_userver_module_end()

if(NOT TARGET zstd::zstd)
if(NOT TARGET zstd::libzstd)
if(TARGET libzstd_static)
add_library(zstd::zstd ALIAS libzstd_static)
add_library(zstd::libzstd ALIAS libzstd_static)
else()
add_library(zstd::zstd ALIAS zstd)
add_library(zstd::libzstd ALIAS zstd)
endif()
endif()
if(NOT TARGET ZSTD::ZSTD)
Expand Down
2 changes: 1 addition & 1 deletion universal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ else()
target_link_libraries(
${PROJECT_NAME}
PUBLIC fmt cctz userver-stacktrace
PRIVATE yaml-cpp zstd::zstd cryptopp::cryptopp
PRIVATE yaml-cpp::yaml-cpp zstd::libzstd cryptopp::cryptopp
)

if(CMAKE_SYSTEM_NAME MATCHES "Darwin"
Expand Down
Loading