aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-14 11:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: FindLibwww search also for libexpat

Browse source
This commit is contained in:
kervala 2010-09-04 20:18:44 +02:00
parent dd8924a11a
commit 2511286f37
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/CMakeModules/FindLibwww.cmake
View file

@ -109,6 +109,10 @@ IF(WIN32)
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)
FIND_PACKAGE(EXPAT)
SET(LIBWWW_INCLUDE_DIR ${LIBWWW_INCLUDE_DIR} ${EXPAT_INCLUDE_DIRS})
SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${EXPAT_LIBRARIES})
ENDIF(WIN32) ENDIF(WIN32)
IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR) IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR)

5
code/ryzom/CMakeLists.txt
View file

@ -23,13 +23,8 @@ NL_CONFIGURE_CHECKS()
IF(WITH_STATIC) IF(WITH_STATIC)
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES}) SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
SET(CURL_DEFINITIONS -DCURL_STATICLIB) SET(CURL_DEFINITIONS -DCURL_STATICLIB)
SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC)
ENDIF(WITH_STATIC) ENDIF(WITH_STATIC)
IF(NOT WIN32)
SET(EXPAT_LIBRARY expat)
ENDIF(NOT WIN32)
ADD_SUBDIRECTORY(common) ADD_SUBDIRECTORY(common)
IF(WITH_RYZOM_CLIENT) IF(WITH_RYZOM_CLIENT)