From 97917f9602f0c9c5877747936aeba143e6e6e845 Mon Sep 17 00:00:00 2001 From: rti Date: Thu, 3 Jun 2010 09:41:32 +0200 Subject: [PATCH] Fixed: #957 find all the libwww sub libraries - not only on mac --- code/ryzom/CMakeModules/FindLibwww.cmake | 67 +++++++++++------------- 1 file changed, 31 insertions(+), 36 deletions(-) diff --git a/code/ryzom/CMakeModules/FindLibwww.cmake b/code/ryzom/CMakeModules/FindLibwww.cmake index 3f9b01050..d109791b9 100644 --- a/code/ryzom/CMakeModules/FindLibwww.cmake +++ b/code/ryzom/CMakeModules/FindLibwww.cmake @@ -57,44 +57,39 @@ MACRO(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 -IF(APPLE) - # find all the libwww libraries - FIND_WWW_LIBRARY(LIBWWWAPP_LIBRARY wwwapp) - FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache) - FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore) - FIND_WWW_LIBRARY(LIBWWWDIR_LIBRARY wwwdir) - 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(LIBWWWHTTP_LIBRARY wwwhttp) - FIND_WWW_LIBRARY(LIBWWWINIT_LIBRARY wwwinit) - FIND_WWW_LIBRARY(LIBWWWMIME_LIBRARY wwwmime) - FIND_WWW_LIBRARY(LIBWWWMUX_LIBRARY wwwmux) - FIND_WWW_LIBRARY(LIBWWWNEWS_LIBRARY wwwnews) - FIND_WWW_LIBRARY(LIBWWWSSL_LIBRARY wwwssl) - FIND_WWW_LIBRARY(LIBWWWSTREAM_LIBRARY wwwstream) - FIND_WWW_LIBRARY(LIBWWWTELNET_LIBRARY wwwtelnet) - FIND_WWW_LIBRARY(LIBWWWTRANS_LIBRARY wwwtrans) - FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY wwwutils) - FIND_WWW_LIBRARY(LIBWWWXML_LIBRARY wwwxml) - FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip) +FIND_WWW_LIBRARY(LIBWWWAPP_LIBRARY wwwapp) +FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache) +FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore) +FIND_WWW_LIBRARY(LIBWWWDIR_LIBRARY wwwdir) +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(LIBWWWHTTP_LIBRARY wwwhttp) +FIND_WWW_LIBRARY(LIBWWWINIT_LIBRARY wwwinit) +FIND_WWW_LIBRARY(LIBWWWMIME_LIBRARY wwwmime) +FIND_WWW_LIBRARY(LIBWWWMUX_LIBRARY wwwmux) +FIND_WWW_LIBRARY(LIBWWWNEWS_LIBRARY wwwnews) +FIND_WWW_LIBRARY(LIBWWWSSL_LIBRARY wwwssl) +FIND_WWW_LIBRARY(LIBWWWSTREAM_LIBRARY wwwstream) +FIND_WWW_LIBRARY(LIBWWWTELNET_LIBRARY wwwtelnet) +FIND_WWW_LIBRARY(LIBWWWTRANS_LIBRARY wwwtrans) +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 - SET(LIBWWW_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} ${LIBWWWSSL_LIBRARY} ${LIBWWWSTREAM_LIBRARY} - ${LIBWWWTELNET_LIBRARY} ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} - ${LIBWWWXML_LIBRARY} ${LIBWWWZIP_LIBRARY} - ) -ELSE(APPLE) - FIND_WWW_LIBRARY(LIBWWW_LIBRARY wwwapp) -ENDIF(APPLE) +# combine all the libraries into one variable +SET(LIBWWW_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} ${LIBWWWSSL_LIBRARY} ${LIBWWWSTREAM_LIBRARY} + ${LIBWWWTELNET_LIBRARY} ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} + ${LIBWWWXML_LIBRARY} ${LIBWWWZIP_LIBRARY} +) IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR) SET(LIBWWW_FOUND "YES")