merged FindLibwww.cmake

This commit is contained in:
mattraykowski 2010-09-09 06:44:01 -06:00
parent 4df3db7485
commit 7b554697cc

View file

@ -57,6 +57,12 @@ MACRO(FIND_WWW_LIBRARY MYLIBRARY)
/opt/lib /opt/lib
/usr/freeware/lib64 /usr/freeware/lib64
) )
IF(${MYLIBRARY})
SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${${MYLIBRARY}})
ELSE(${MYLIBRARY})
MESSAGE(STATUS "Warning: Libwww: Library not found: ${MYLIBRARY}")
ENDIF(${MYLIBRARY})
ENDMACRO(FIND_WWW_LIBRARY MYLIBRARY) 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"
@ -83,30 +89,6 @@ FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY wwwutils)
FIND_WWW_LIBRARY(LIBWWWXML_LIBRARY wwwxml) FIND_WWW_LIBRARY(LIBWWWXML_LIBRARY wwwxml)
FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip) FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip)
# combine all the libraries into one variable
SET(LIBWWW_LIBRARIES
${LIBMD5_LIBRARY}
${LIBWWWAPP_LIBRARY}
${LIBWWWCACHE_LIBRARY}
${LIBWWWCORE_LIBRARY}
${LIBWWWDIR_LIBRARY}
${LIBWWWFILE_LIBRARY}
${LIBWWWFTP_LIBRARY}
${LIBWWWGOPHER_LIBRARY}
${LIBWWWHTML_LIBRARY}
${LIBWWWHTTP_LIBRARY}
${LIBWWWINIT_LIBRARY}
${LIBWWWMIME_LIBRARY}
${LIBWWWMUX_LIBRARY}
${LIBWWWNEWS_LIBRARY}
${LIBWWWSTREAM_LIBRARY}
${LIBWWWTELNET_LIBRARY}
${LIBWWWTRANS_LIBRARY}
${LIBWWWUTILS_LIBRARY}
${LIBWWWXML_LIBRARY}
${LIBWWWZIP_LIBRARY}
)
# Windows libwww version needs GNU Regex # Windows libwww version needs GNU Regex
IF(WIN32) IF(WIN32)
FIND_PATH(LIBWWW_REGEX_INCLUDE_DIR FIND_PATH(LIBWWW_REGEX_INCLUDE_DIR
@ -124,7 +106,6 @@ IF(WIN32)
IF(LIBWWW_REGEX_INCLUDE_DIR) IF(LIBWWW_REGEX_INCLUDE_DIR)
SET(LIBWWW_INCLUDE_DIR ${LIBWWW_INCLUDE_DIR} ${LIBWWW_REGEX_INCLUDE_DIR}) SET(LIBWWW_INCLUDE_DIR ${LIBWWW_INCLUDE_DIR} ${LIBWWW_REGEX_INCLUDE_DIR})
FIND_WWW_LIBRARY(LIBREGEX_LIBRARY gnu_regex) FIND_WWW_LIBRARY(LIBREGEX_LIBRARY gnu_regex)
SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${LIBREGEX_LIBRARY})
ENDIF(LIBWWW_REGEX_INCLUDE_DIR) ENDIF(LIBWWW_REGEX_INCLUDE_DIR)
ELSE(WIN32) ELSE(WIN32)
FIND_PACKAGE(EXPAT) FIND_PACKAGE(EXPAT)