Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #842 Correctly add found libwww libraries the the LIBWWW_LIBRARIES variable.

Browse source
This commit is contained in:
mattraykowski 2010-09-09 06:40:07 -06:00
parent 58635a112c
commit 52483da28f
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/CMakeModules/FindLibwww.cmake
View file

@ -57,11 +57,17 @@ 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 "Libwww: Could not find: ${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"
# we need to link them all manually # we need to link them all manually
FIND_WWW_LIBRARY(LIBMD5_LIBRARY md5) 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)
@ -83,13 +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
${LIBWWWAPP_LIBRARY} ${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} ${LIBWWWHTML_LIBRARY}
${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY}
${LIBWWWSTREAM_LIBRARY} ${LIBWWWCACHE_LIBRARY} ${LIBWWWFILE_LIBRARY} ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_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
@ -107,7 +106,7 @@ 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}) #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)