Merge branch 'core4' into feature/quick-start-py

CMakeLists.txt

@@ -222,7 +222,7 @@ IF(WITH_STATIC)
     SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${WINSOCK2_LIB})
   ENDIF()
 
-  IF(UNIX)
+  IF(UNIX AND NOT HUNTER_ENABLED)
     # under Linux and OS X, recent libxml2 versions are linked against liblzma
     FIND_PACKAGE(LibLZMA)
     IF(LIBLZMA_LIBRARIES)

CMakeModules/FindHelpers.cmake

@@ -696,7 +696,7 @@ MACRO(FIND_LIBXML2)
         IF(CRYPT32_LIB)
           LIST(APPEND LIBXML2_LIBRARIES ${CRYPT32_LIB})
         ENDIF()
-      ELSE()
+      ELSEIF(NOT HUNTER_ENABLED)
         # under Linux and OS X, recent libxml2 versions are linked against liblzma
         FIND_PACKAGE(LibLZMA)
 

ryzom/tools/CMakeLists.txt

@@ -1,5 +1,7 @@
 
-FIND_PACKAGE(MySQL)
+IF(NOT HUNTER_ENABLED)
+  FIND_PACKAGE(MySQL)
+ENDIF()
 
 IF(WITH_RYZOM_TOOLS)
   ADD_SUBDIRECTORY(skill_extractor)