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

Fixed: #957 find all the libwww sub libraries - not only on mac

Browse source
This commit is contained in:
rti 2010-06-03 09:41:32 +02:00
parent 465e866e1d
commit ed965d79b0
1 changed files with 31 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/ryzom/CMakeModules/FindLibwww.cmake
View file

@ -57,10 +57,8 @@ 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 all the libwww libraries
FIND_WWW_LIBRARY(LIBWWWAPP_LIBRARY wwwapp) FIND_WWW_LIBRARY(LIBWWWAPP_LIBRARY wwwapp)
FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache) FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache)
FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore) FIND_WWW_LIBRARY(LIBWWWCORE_LIBRARY wwwcore)
@ -92,9 +90,6 @@ IF(APPLE)
${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")