Changed: #842 Some unneeded libwww libs are needed on some platforms
This commit is contained in:
parent
5b1ac86c52
commit
5f1aefc441
1 changed files with 15 additions and 4 deletions
|
@ -38,7 +38,9 @@ FIND_PATH(LIBWWW_ADDITIONAL_INCLUDE_DIR
|
||||||
)
|
)
|
||||||
|
|
||||||
# combine both include directories into one variable
|
# combine both include directories into one variable
|
||||||
SET(LIBWWW_INCLUDE_DIR ${LIBWWW_INCLUDE_DIR} ${LIBWWW_ADDITIONAL_INCLUDE_DIR})
|
IF(LIBWWW_ADDITIONAL_INCLUDE_DIR)
|
||||||
|
SET(LIBWWW_INCLUDE_DIR ${LIBWWW_INCLUDE_DIR} ${LIBWWW_ADDITIONAL_INCLUDE_DIR})
|
||||||
|
ENDIF(LIBWWW_ADDITIONAL_INCLUDE_DIR)
|
||||||
|
|
||||||
# helper to find all the libwww sub libraries
|
# helper to find all the libwww sub libraries
|
||||||
MACRO(FIND_WWW_LIBRARY MYLIBRARY)
|
MACRO(FIND_WWW_LIBRARY MYLIBRARY)
|
||||||
|
@ -66,22 +68,31 @@ FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache)
|
||||||
FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore)
|
FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore)
|
||||||
FIND_WWW_LIBRARY(LIBWWWDIR_LIBRARY wwwdir)
|
FIND_WWW_LIBRARY(LIBWWWDIR_LIBRARY wwwdir)
|
||||||
FIND_WWW_LIBRARY(LIBWWWFILE_LIBRARY wwwfile)
|
FIND_WWW_LIBRARY(LIBWWWFILE_LIBRARY wwwfile)
|
||||||
|
FIND_WWW_LIBRARY(LIBWWWFTP_LIBRARY wwwftp)
|
||||||
|
FIND_WWW_LIBRARY(LIBWWWGOPHER_LIBRARY wwwgopher)
|
||||||
FIND_WWW_LIBRARY(LIBWWWHTML_LIBRARY wwwhtml)
|
FIND_WWW_LIBRARY(LIBWWWHTML_LIBRARY wwwhtml)
|
||||||
FIND_WWW_LIBRARY(LIBWWWHTTP_LIBRARY wwwhttp)
|
FIND_WWW_LIBRARY(LIBWWWHTTP_LIBRARY wwwhttp)
|
||||||
FIND_WWW_LIBRARY(LIBWWWINIT_LIBRARY wwwinit)
|
FIND_WWW_LIBRARY(LIBWWWINIT_LIBRARY wwwinit)
|
||||||
FIND_WWW_LIBRARY(LIBWWWMIME_LIBRARY wwwmime)
|
FIND_WWW_LIBRARY(LIBWWWMIME_LIBRARY wwwmime)
|
||||||
FIND_WWW_LIBRARY(LIBWWWMUX_LIBRARY wwwmux)
|
FIND_WWW_LIBRARY(LIBWWWMUX_LIBRARY wwwmux)
|
||||||
|
FIND_WWW_LIBRARY(LIBWWWNEWS_LIBRARY wwwnews)
|
||||||
FIND_WWW_LIBRARY(LIBWWWSTREAM_LIBRARY wwwstream)
|
FIND_WWW_LIBRARY(LIBWWWSTREAM_LIBRARY wwwstream)
|
||||||
|
FIND_WWW_LIBRARY(LIBWWWTELNET_LIBRARY wwwtelnet)
|
||||||
FIND_WWW_LIBRARY(LIBWWWTRANS_LIBRARY wwwtrans)
|
FIND_WWW_LIBRARY(LIBWWWTRANS_LIBRARY wwwtrans)
|
||||||
FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY wwwutils)
|
FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY wwwutils)
|
||||||
|
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
|
||||||
${LIBMD5_LIBRARY} ${LIBWWWAPP_LIBRARY} ${LIBWWWCACHE_LIBRARY}
|
${LIBMD5_LIBRARY} ${LIBWWWAPP_LIBRARY} ${LIBWWWCACHE_LIBRARY}
|
||||||
${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} ${LIBWWWFILE_LIBRARY}
|
${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} ${LIBWWWFILE_LIBRARY}
|
||||||
${LIBWWWHTML_LIBRARY} ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY}
|
${LIBWWWFTP_LIBRARY} ${LIBWWWGOPHER_LIBRARY} ${LIBWWWHTML_LIBRARY}
|
||||||
${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY} ${LIBWWWSTREAM_LIBRARY}
|
${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY}
|
||||||
${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY}
|
${LIBWWWMUX_LIBRARY} ${LIBWWWNEWS_LIBRARY}
|
||||||
|
${LIBWWWSTREAM_LIBRARY} ${LIBWWWTELNET_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