mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
switch to cmake to simplify the build and fix automagic fix owner in systemd unit Closes: https://bugs.gentoo.org/979048 Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://codeberg.org/gentoo/gentoo/pulls/1377 Signed-off-by: Sam James <sam@gentoo.org>
29 lines
963 B
Diff
29 lines
963 B
Diff
backport https://github.com/3proxy/3proxy/commit/b59c044.patch
|
|
plugins was not installed otherwise
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -661,16 +661,18 @@ foreach(PROXY_NAME proxy socks pop3p smtpp ftppr tcppm udppm tlspr)
|
|
endforeach()
|
|
|
|
# Install plugins
|
|
-file(GLOB PLUGINFILES "${PLUGIN_OUTPUT_DIR}/*${PLUGIN_SUFFIX}")
|
|
+# Use install(DIRECTORY ... FILES_MATCHING) so the glob resolves at install
|
|
+# time, after plugin targets have been built. A configure-time file(GLOB)
|
|
+# would run before any plugin exists and install nothing.
|
|
if(WIN32)
|
|
- install(FILES
|
|
- ${PLUGINFILES}
|
|
+ install(DIRECTORY ${PLUGIN_OUTPUT_DIR}/
|
|
DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ FILES_MATCHING PATTERN "*${PLUGIN_SUFFIX}"
|
|
)
|
|
else()
|
|
- install(FILES
|
|
- ${PLUGINFILES}
|
|
+ install(DIRECTORY ${PLUGIN_OUTPUT_DIR}/
|
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}/3proxy
|
|
+ FILES_MATCHING PATTERN "*${PLUGIN_SUFFIX}"
|
|
)
|
|
endif()
|
|
|