Merge branch 'atys' into ryzom/ui/improvements

5 years ago · 264b50a5ec
parent debb6b7d0c d4e5af7df2
commit 264b50a5ec
1 changed files with 7 additions and 0 deletions
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@ -152,6 +152,13 @@ IF(WITH_STATIC)
    IF(LIBLZMA_LIBRARIES)
      SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBLZMA_LIBRARIES})
    ENDIF()
+
+    # under Linux and OS X, recent libxml2 versions are linked against libicu
+    FIND_PACKAGE(Icu)
+    IF(ICU_LIBRARIES)
+       SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICU_LIBRARIES} ${ICU_DATA_LIBRARIES})
+    ENDIF()
+
  ENDIF()
 ENDIF()