mirror of
https://github.com/znc/znc.git
synced 2026-05-07 05:44:41 +02:00
Try to simplify building modules
This commit is contained in:
+1
-1
@@ -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@")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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}"
|
||||
|
||||
@@ -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"
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user