Skip to content

Commit 6ec9b7a

Browse files
committed
feat build: change zstd and yaml-cpp in Find*.cmake to be compatible with upstream names
required to fix errors and warnings when -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
1 parent 2f94c1e commit 6ec9b7a

4 files changed

Lines changed: 9 additions & 5 deletions

File tree

cmake/SetupRdKafka.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if(NOT USERVER_FORCE_DOWNLOAD_PACKAGES)
3131
OpenSSL::SSL
3232
OpenSSL::Crypto
3333
SASL2::SASL2
34-
zstd::zstd
34+
zstd::libzstd
3535
)
3636
return()
3737
endif()

cmake/modules/Findyaml-cpp.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ _userver_module_find_include(NAMES yaml-cpp/yaml.h yaml-cpp/node.h PATH_SUFFIXES
1313
_userver_module_find_library(NAMES yaml-cpp PATH_SUFFIXES lib)
1414

1515
_userver_module_end()
16+
17+
if(NOT TARGET yaml-cpp::yaml-cpp)
18+
add_library(yaml-cpp::yaml-cpp ALIAS yaml-cpp)
19+
endif()

cmake/modules/Findzstd.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ _userver_module_find_library(NAMES zstd PATH_SUFFIXES lib)
1313

1414
_userver_module_end()
1515

16-
if(NOT TARGET zstd::zstd)
16+
if(NOT TARGET zstd::libzstd)
1717
if(TARGET libzstd_static)
18-
add_library(zstd::zstd ALIAS libzstd_static)
18+
add_library(zstd::libzstd ALIAS libzstd_static)
1919
else()
20-
add_library(zstd::zstd ALIAS zstd)
20+
add_library(zstd::libzstd ALIAS zstd)
2121
endif()
2222
endif()
2323
if(NOT TARGET ZSTD::ZSTD)

universal/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ else()
247247
target_link_libraries(
248248
${PROJECT_NAME}
249249
PUBLIC fmt cctz userver-stacktrace
250-
PRIVATE yaml-cpp zstd::zstd cryptopp::cryptopp
250+
PRIVATE yaml-cpp::yaml-cpp zstd::libzstd cryptopp::cryptopp
251251
)
252252

253253
if(CMAKE_SYSTEM_NAME MATCHES "Darwin"

0 commit comments

Comments
 (0)