Maybe fix macos build again

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86a9f62dc99873ecdcca2d6609073026659cdf61..2c671de80055638c61e85cb6590f22fc37af1635 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,6 +80,7 @@ macro(tristate_option opt help)
 endmacro()
 
 set(ZNC_CMAKE_FIND_DEPS "")
+set(zncpubdeps)
 
 tristate_option(OPENSSL "Support SSL")
 if(WANT_OPENSSL)
@@ -99,6 +100,7 @@ if(WANT_OPENSSL)
                check_SSL_SESSION_get0_cipher()
                set(ZNC_CMAKE_FIND_DEPS
                        "${ZNC_CMAKE_FIND_DEPS}\nfind_dependency(OpenSSL)")
+               list(APPEND zncpubdeps OpenSSL::SSL)
        endif()
 endif()
 set(HAVE_LIBSSL "${OPENSSL_FOUND}")
@@ -152,6 +154,7 @@ endif()
 set(HAVE_ICU "${ICU_FOUND}")
 if(ICU_FOUND)
        set(ZNC_CMAKE_FIND_DEPS "${ZNC_CMAKE_FIND_DEPS}\nfind_dependency_pc(ICU icu-uc)")
+       list(APPEND zncpubdeps PkgConfig::ICU)
 endif()
 
 set(WANT_PERL false CACHE BOOL "Support Perl modules")

diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index a71dcf032e97293d619f2ee77fd4edd78f754c2f..a737285d913e1bd98a7926fdc768c4adcb24e3d3 100644 (file)
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -37,11 +37,8 @@ function(add_cxx_module mod modpath)
        if(moddepend_${mod})
                add_dependencies("module_${mod}" ${moddepend_${mod}})
        endif()
-       # ${znclib_LIB_DEPENDS} is to overcome OSX's need for -undefined suppress
-       # when accessing symbols exported by dependencies of znclib (e.g.
-       # openssl), but not used in znclib itself
        target_link_libraries("module_${mod}" PRIVATE ZNC ${modlink_${mod}}
-               ${znclib_LIB_DEPENDS})
+               ${zncpubdeps})
        set_target_properties("module_${mod}" PROPERTIES "" "" ${modprop_${mod}})
        install(TARGETS "module_${mod}"
                LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/znc")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 51fc0e3f78c99abac7606f8d83d9d84cd4eae447..961ffc953c36bf80176d1c38dcfebd5235c66d7f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,21 +66,16 @@ set(znc_include_dirs
        "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>"
        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
 target_link_libraries(znclib PRIVATE ${CMAKE_DL_LIBS} Threads::Threads)
-if(OPENSSL_FOUND)
-       target_link_libraries(znclib PUBLIC OpenSSL::SSL)
-endif()
 if(ZLIB_FOUND)
        target_link_libraries(znclib PRIVATE ZLIB::ZLIB)
 endif()
-if(ICU_FOUND)
-       target_link_libraries(znclib PUBLIC PkgConfig::ICU)
-endif()
 if(Boost_FOUND)
        target_link_libraries(znclib PRIVATE Boost::locale)
 endif()
 if(ZNC_HAVE_ARGON)
        target_link_libraries(znclib PRIVATE PkgConfig::ARGON)
 endif()
+target_link_libraries(znclib PUBLIC ${zncpubdeps})
 target_link_libraries(znclib PRIVATE cctz::cctz)
 target_include_directories(znc PUBLIC ${znc_include_dirs})
 target_include_directories(znclib PUBLIC ${znc_include_dirs})