Fixed: #958 libmd5 is not linked (patch by vbmithr)
This commit is contained in:
parent
ad475cbc17
commit
9776243af9
1 changed files with 10 additions and 7 deletions
|
@ -59,6 +59,8 @@ ENDMACRO(FIND_WWW_LIBRARY MYLIBRARY)
|
||||||
|
|
||||||
# on eg. mac os x and arch linux, libwww sub libraries are not "inter-linked"
|
# on eg. mac os x and arch linux, libwww sub libraries are not "inter-linked"
|
||||||
# we need to link them all manually
|
# we need to link them all manually
|
||||||
|
|
||||||
|
FIND_WWW_LIBRARY(LIBMD5_LIBRARY md5)
|
||||||
FIND_WWW_LIBRARY(LIBWWWAPP_LIBRARY wwwapp)
|
FIND_WWW_LIBRARY(LIBWWWAPP_LIBRARY wwwapp)
|
||||||
FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache)
|
FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache)
|
||||||
FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore)
|
FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore)
|
||||||
|
@ -82,13 +84,14 @@ FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip)
|
||||||
|
|
||||||
# combine all the libraries into one variable
|
# combine all the libraries into one variable
|
||||||
SET(LIBWWW_LIBRARY
|
SET(LIBWWW_LIBRARY
|
||||||
${LIBWWWAPP_LIBRARY} ${LIBWWWCACHE_LIBRARY} ${LIBWWWCORE_LIBRARY}
|
${LIBMD5_LIBRARY} ${LIBWWWAPP_LIBRARY} ${LIBWWWCACHE_LIBRARY}
|
||||||
${LIBWWWDIR_LIBRARY} ${LIBWWWFILE_LIBRARY} ${LIBWWWFTP_LIBRARY}
|
${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} ${LIBWWWFILE_LIBRARY}
|
||||||
${LIBWWWGOPHER_LIBRARY} ${LIBWWWHTML_LIBRARY} ${LIBWWWHTTP_LIBRARY}
|
${LIBWWWFTP_LIBRARY} ${LIBWWWGOPHER_LIBRARY} ${LIBWWWHTML_LIBRARY}
|
||||||
${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY}
|
${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY}
|
||||||
${LIBWWWNEWS_LIBRARY} ${LIBWWWSSL_LIBRARY} ${LIBWWWSTREAM_LIBRARY}
|
${LIBWWWMUX_LIBRARY} ${LIBWWWNEWS_LIBRARY} ${LIBWWWSSL_LIBRARY}
|
||||||
${LIBWWWTELNET_LIBRARY} ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY}
|
${LIBWWWSTREAM_LIBRARY} ${LIBWWWTELNET_LIBRARY}
|
||||||
${LIBWWWXML_LIBRARY} ${LIBWWWZIP_LIBRARY}
|
${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} ${LIBWWWXML_LIBRARY}
|
||||||
|
${LIBWWWZIP_LIBRARY}
|
||||||
)
|
)
|
||||||
|
|
||||||
IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR)
|
IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR)
|
||||||
|
|
Loading…
Reference in a new issue