diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index adec83256f..10760ae835 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -205,8 +205,6 @@ UNIFY_ENVVARS_AND_CACHE(EIGEN_DIR) if(NOT MINIMAL_BUILD) UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_INCLUDE_DIR) UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_LIBRARY_DIR) - UNIFY_ENVVARS_AND_CACHE(LIBXML2_INCLUDE_DIR) - UNIFY_ENVVARS_AND_CACHE(LIBXML2_LIBRARIES) UNIFY_ENVVARS_AND_CACHE(PCRE_LIBRARY_DIR) UNIFY_ENVVARS_AND_CACHE(PYTHON_INCLUDE_DIR) UNIFY_ENVVARS_AND_CACHE(PYTHON_LIBRARY) diff --git a/cmake/FindLibXml2.cmake b/cmake/FindLibXml2.cmake index e0ee4975e5..0bfab4f2b6 100644 --- a/cmake/FindLibXml2.cmake +++ b/cmake/FindLibXml2.cmake @@ -13,6 +13,9 @@ # To avoid cyclic calls to this file list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}) +UNIFY_ENVVARS_AND_CACHE(LIBXML2_INCLUDE_DIR) +UNIFY_ENVVARS_AND_CACHE(LIBXML2_LIBRARIES) + if((NOT LIBXML2_INCLUDE_DIR AND NOT LIBXML2_LIBRARIES)) # First try config mode (probably works with vcpkg, Conan, macOS brew installs, but not on ubuntu 22.04) # CONFIG is provided using root path, so no need to clear sysroot here.