From 1fb977f16b10c75304132b93105b45b13647a52b Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 31 Jan 2022 19:24:35 +0800 Subject: [PATCH] Remove more wrongly found dependencies under Hunter --- CMakeLists.txt | 2 +- CMakeModules/FindHelpers.cmake | 2 +- ryzom/tools/CMakeLists.txt | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02652ffc3..b8bc4af3e 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/CMakeModules/FindHelpers.cmake b/CMakeModules/FindHelpers.cmake index 06edd0bcb..a9d66a553 100644 --- a/CMakeModules/FindHelpers.cmake +++ b/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) diff --git a/ryzom/tools/CMakeLists.txt b/ryzom/tools/CMakeLists.txt index b97c9be8e..76f824621 100644 --- a/ryzom/tools/CMakeLists.txt +++ b/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)