From b38c00bb0d036fb11c0f236c8345d051f869ae0c Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun, 14 Sep 2025 15:50:50 +0100
Subject: [PATCH] cmake: consolidate zlib/zstd library handling

Move the handling to the top-level, adding it _once_ to EXTRA_LIBS.
Thus avoiding some duplication across the board.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
 CMakeLists.txt                | 2 ++
 src/gui/curses/CMakeLists.txt | 6 ------
 tests/fuzz/CMakeLists.txt     | 8 --------
 tests/unit/CMakeLists.txt     | 2 --
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9d6a77bc..9e73552f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,10 +258,12 @@ list(APPEND EXTRA_LIBS ${GNUTLS_LDFLAGS})
 
 # Check for zlib
 find_package(ZLIB REQUIRED)
+list(APPEND EXTRA_LIBS ${ZLIB_LIBRARY})
 
 # Check for zstd
 if(ENABLE_ZSTD)
   pkg_check_modules(LIBZSTD REQUIRED libzstd)
+  list(APPEND EXTRA_LIBS ${LIBZSTD_LDFLAGS})
   add_definitions(-DHAVE_ZSTD)
 endif()
 
diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
index 622d92d95..de2371ce6 100644
--- a/src/gui/curses/CMakeLists.txt
+++ b/src/gui/curses/CMakeLists.txt
@@ -47,12 +47,6 @@ endif()
 
 list(APPEND EXTRA_LIBS "m")
 
-list(APPEND EXTRA_LIBS ${ZLIB_LIBRARY})
-
-if(ENABLE_ZSTD)
-  list(APPEND EXTRA_LIBS ${LIBZSTD_LDFLAGS})
-endif()
-
 if(ENABLE_NCURSES)
   subdirs(normal)
 endif()
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index 2f5e600cc..c4c169771 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -66,12 +66,6 @@ endif()
 
 list(APPEND EXTRA_LIBS "m")
 
-list(APPEND EXTRA_LIBS ${ZLIB_LIBRARY})
-
-if(ENABLE_ZSTD)
-  list(APPEND EXTRA_LIBS ${LIBZSTD_LDFLAGS})
-endif()
-
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   # link with resolv lib on macOS
   list(APPEND EXTRA_LIBS "resolv")
@@ -84,8 +78,6 @@ list(APPEND FUZZ_TARGET_LINK
   weechat_gui_headless
   weechat_ncurses_fake
   ${EXTRA_LIBS}
-  ${ZLIB_LIBRARY}
-  ${LIBZSTD_LDFLAGS}
   -rdynamic
 )
 
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index f8c84c41b..8c3fbf865 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -235,8 +235,6 @@ target_link_libraries(tests
   weechat_ncurses_fake
   weechat_unit_tests_core
   ${EXTRA_LIBS}
-  ${ZLIB_LIBRARY}
-  ${LIBZSTD_LDFLAGS}
   ${CPPUTEST_LIBRARIES}
   -rdynamic
 )