From afe94158a75a68ddeb398e96b091008fa2b0c4e0 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Sat, 30 Sep 2023 11:59:53 +0100
Subject: [PATCH] Try to simplify building modules

---
 ZNCConfig.cmake.in               | 2 +-
 modules/CMakeLists.txt           | 3 +--
 modules/modperl/CMakeLists.txt   | 2 +-
 modules/modpython/CMakeLists.txt | 3 +--
 src/CMakeLists.txt               | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ZNCConfig.cmake.in b/ZNCConfig.cmake.in
index c2591fad..1760bb46 100644
--- a/ZNCConfig.cmake.in
+++ b/ZNCConfig.cmake.in
@@ -47,7 +47,7 @@ function(znc_setup_module)
 		SUFFIX ".so"
 		NO_SONAME true
 		CXX_VISIBILITY_PRESET "hidden")
-	target_link_libraries("${znc_mod_TARGET}" PRIVATE ZNC::ZNC @zncpubdeps@)
+	target_link_libraries("${znc_mod_TARGET}" PRIVATE ZNC::ZNC)
 endfunction()
 
 message(STATUS "Found ZNC @ZNC_VERSION@")
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index a737285d..409e1f27 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -37,8 +37,7 @@ function(add_cxx_module mod modpath)
 	if(moddepend_${mod})
 		add_dependencies("module_${mod}" ${moddepend_${mod}})
 	endif()
-	target_link_libraries("module_${mod}" PRIVATE ZNC ${modlink_${mod}}
-		${zncpubdeps})
+	target_link_libraries("module_${mod}" PRIVATE ZNC ${modlink_${mod}})
 	set_target_properties("module_${mod}" PROPERTIES "" "" ${modprop_${mod}})
 	install(TARGETS "module_${mod}"
 		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/znc")
diff --git a/modules/modperl/CMakeLists.txt b/modules/modperl/CMakeLists.txt
index 59befc29..4edf5191 100644
--- a/modules/modperl/CMakeLists.txt
+++ b/modules/modperl/CMakeLists.txt
@@ -82,7 +82,7 @@ target_include_directories(modperl_lib PRIVATE
 	"${CMAKE_CURRENT_BINARY_DIR}/.."
 	"${CMAKE_CURRENT_SOURCE_DIR}/.."
 	${PERL_INCLUDE_DIRS})
-target_link_libraries(modperl_lib ${znc_link} ${zncpubdeps})
+target_link_libraries(modperl_lib ZNC)
 set_target_properties(modperl_lib PROPERTIES
 	PREFIX ""
 	SUFFIX ".${perl_ext}"
diff --git a/modules/modpython/CMakeLists.txt b/modules/modpython/CMakeLists.txt
index 8a217041..bc92b428 100644
--- a/modules/modpython/CMakeLists.txt
+++ b/modules/modpython/CMakeLists.txt
@@ -75,8 +75,7 @@ target_include_directories(modpython_lib PRIVATE
 	"${CMAKE_CURRENT_BINARY_DIR}/.."
 	"${CMAKE_CURRENT_SOURCE_DIR}/.."
 	${Python3_INCLUDE_DIRS})
-target_link_libraries(modpython_lib ${znc_link} ${Python3_LDFLAGS}
-	${zncpubdeps})
+target_link_libraries(modpython_lib ZNC ${Python3_LDFLAGS})
 set_target_properties(modpython_lib PROPERTIES
 	PREFIX "_"
 	OUTPUT_NAME "znc_core"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 961ffc95..cf919088 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -100,7 +100,7 @@ target_compile_features(znc PUBLIC ${required_cxx11_features})
 target_compile_features(znclib PUBLIC ${required_cxx11_features})
 
 add_library(ZNC INTERFACE)
-target_link_libraries(ZNC INTERFACE ${znc_link})
+target_link_libraries(ZNC INTERFACE ${znc_link} ${zncpubdeps})
 target_compile_definitions(ZNC INTERFACE "znc_export_lib_EXPORTS")
 
 if(HAVE_I18N)