File tree Expand file tree Collapse file tree 3 files changed +16
-1
lines changed
Expand file tree Collapse file tree 3 files changed +16
-1
lines changed Original file line number Diff line number Diff line change 22
33## 0.17.1 - TBD
44
5+ ### Enhancements
6+ - Added support for Conan-installed zstd (credit: @Hailios )
7+
58### Bug fixes
69- Added missing copying of ` ts_event ` when upgrading structs from DBNv1 to DBNv2
710- Fixed setting of compiler warnings and warnings that had accumulated
Original file line number Diff line number Diff line change @@ -211,7 +211,7 @@ target_link_libraries(
211211 OpenSSL::Crypto
212212 OpenSSL::SSL
213213 Threads::Threads
214- zstd::zstd
214+ ${ZSTD_TARGET}
215215)
216216
217217target_compile_definitions (
Original file line number Diff line number Diff line change @@ -50,3 +50,15 @@ if(ZSTD_FOUND AND NOT TARGET zstd::zstd)
5050 INTERFACE_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR}
5151 )
5252endif ()
53+
54+ # Check if the Conan-provided target exists
55+ if (TARGET zstd::libzstd_static)
56+ # If the Conan target exists, use it
57+ set (ZSTD_TARGET zstd::libzstd_static)
58+ elseif (TARGET zstd::zstd)
59+ # If the system-installed target exists, use it
60+ set (ZSTD_TARGET zstd::zstd)
61+ else ()
62+ # Error out if neither target is found
63+ message (FATAL_ERROR "Zstd target not found." )
64+ endif ()
You can’t perform that action at this time.
0 commit comments