Fixed: #957 find all the libwww sub libraries - not only on mac
This commit is contained in:
parent
45b277e75f
commit
b5f889693c
1 changed files with 31 additions and 36 deletions
|
@ -57,44 +57,39 @@ MACRO(FIND_WWW_LIBRARY MYLIBRARY)
|
||||||
)
|
)
|
||||||
ENDMACRO(FIND_WWW_LIBRARY MYLIBRARY)
|
ENDMACRO(FIND_WWW_LIBRARY MYLIBRARY)
|
||||||
|
|
||||||
# on mac os x, 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
|
||||||
IF(APPLE)
|
FIND_WWW_LIBRARY(LIBWWWAPP_LIBRARY wwwapp)
|
||||||
# find all the libwww libraries
|
FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache)
|
||||||
FIND_WWW_LIBRARY(LIBWWWAPP_LIBRARY wwwapp)
|
FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore)
|
||||||
FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache)
|
FIND_WWW_LIBRARY(LIBWWWDIR_LIBRARY wwwdir)
|
||||||
FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore)
|
FIND_WWW_LIBRARY(LIBWWWFILE_LIBRARY wwwfile)
|
||||||
FIND_WWW_LIBRARY(LIBWWWDIR_LIBRARY wwwdir)
|
FIND_WWW_LIBRARY(LIBWWWFTP_LIBRARY wwwftp)
|
||||||
FIND_WWW_LIBRARY(LIBWWWFILE_LIBRARY wwwfile)
|
FIND_WWW_LIBRARY(LIBWWWGOPHER_LIBRARY wwwgopher)
|
||||||
FIND_WWW_LIBRARY(LIBWWWFTP_LIBRARY wwwftp)
|
FIND_WWW_LIBRARY(LIBWWWHTML_LIBRARY wwwhtml)
|
||||||
FIND_WWW_LIBRARY(LIBWWWGOPHER_LIBRARY wwwgopher)
|
FIND_WWW_LIBRARY(LIBWWWHTTP_LIBRARY wwwhttp)
|
||||||
FIND_WWW_LIBRARY(LIBWWWHTML_LIBRARY wwwhtml)
|
FIND_WWW_LIBRARY(LIBWWWINIT_LIBRARY wwwinit)
|
||||||
FIND_WWW_LIBRARY(LIBWWWHTTP_LIBRARY wwwhttp)
|
FIND_WWW_LIBRARY(LIBWWWMIME_LIBRARY wwwmime)
|
||||||
FIND_WWW_LIBRARY(LIBWWWINIT_LIBRARY wwwinit)
|
FIND_WWW_LIBRARY(LIBWWWMUX_LIBRARY wwwmux)
|
||||||
FIND_WWW_LIBRARY(LIBWWWMIME_LIBRARY wwwmime)
|
FIND_WWW_LIBRARY(LIBWWWNEWS_LIBRARY wwwnews)
|
||||||
FIND_WWW_LIBRARY(LIBWWWMUX_LIBRARY wwwmux)
|
FIND_WWW_LIBRARY(LIBWWWSSL_LIBRARY wwwssl)
|
||||||
FIND_WWW_LIBRARY(LIBWWWNEWS_LIBRARY wwwnews)
|
FIND_WWW_LIBRARY(LIBWWWSTREAM_LIBRARY wwwstream)
|
||||||
FIND_WWW_LIBRARY(LIBWWWSSL_LIBRARY wwwssl)
|
FIND_WWW_LIBRARY(LIBWWWTELNET_LIBRARY wwwtelnet)
|
||||||
FIND_WWW_LIBRARY(LIBWWWSTREAM_LIBRARY wwwstream)
|
FIND_WWW_LIBRARY(LIBWWWTRANS_LIBRARY wwwtrans)
|
||||||
FIND_WWW_LIBRARY(LIBWWWTELNET_LIBRARY wwwtelnet)
|
FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY wwwutils)
|
||||||
FIND_WWW_LIBRARY(LIBWWWTRANS_LIBRARY wwwtrans)
|
FIND_WWW_LIBRARY(LIBWWWXML_LIBRARY wwwxml)
|
||||||
FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY wwwutils)
|
FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip)
|
||||||
FIND_WWW_LIBRARY(LIBWWWXML_LIBRARY wwwxml)
|
|
||||||
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}
|
${LIBWWWAPP_LIBRARY} ${LIBWWWCACHE_LIBRARY} ${LIBWWWCORE_LIBRARY}
|
||||||
${LIBWWWDIR_LIBRARY} ${LIBWWWFILE_LIBRARY} ${LIBWWWFTP_LIBRARY}
|
${LIBWWWDIR_LIBRARY} ${LIBWWWFILE_LIBRARY} ${LIBWWWFTP_LIBRARY}
|
||||||
${LIBWWWGOPHER_LIBRARY} ${LIBWWWHTML_LIBRARY} ${LIBWWWHTTP_LIBRARY}
|
${LIBWWWGOPHER_LIBRARY} ${LIBWWWHTML_LIBRARY} ${LIBWWWHTTP_LIBRARY}
|
||||||
${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY}
|
${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY}
|
||||||
${LIBWWWNEWS_LIBRARY} ${LIBWWWSSL_LIBRARY} ${LIBWWWSTREAM_LIBRARY}
|
${LIBWWWNEWS_LIBRARY} ${LIBWWWSSL_LIBRARY} ${LIBWWWSTREAM_LIBRARY}
|
||||||
${LIBWWWTELNET_LIBRARY} ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY}
|
${LIBWWWTELNET_LIBRARY} ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY}
|
||||||
${LIBWWWXML_LIBRARY} ${LIBWWWZIP_LIBRARY}
|
${LIBWWWXML_LIBRARY} ${LIBWWWZIP_LIBRARY}
|
||||||
)
|
)
|
||||||
ELSE(APPLE)
|
|
||||||
FIND_WWW_LIBRARY(LIBWWW_LIBRARY wwwapp)
|
|
||||||
ENDIF(APPLE)
|
|
||||||
|
|
||||||
IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR)
|
IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR)
|
||||||
SET(LIBWWW_FOUND "YES")
|
SET(LIBWWW_FOUND "YES")
|
||||||
|
|
Loading…
Reference in a new issue