fix CI issues related to moving dependencies (#4023)

This commit is contained in:
Klaim (Joël Lamotte) 2025-07-28 11:20:34 +02:00 committed by GitHub
parent 14a94d379a
commit ec62904617
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 2 deletions

View File

@ -23,7 +23,8 @@
{ {
"cacheVariables": { "cacheVariables": {
"BUILD_MICROMAMBA": "ON", "BUILD_MICROMAMBA": "ON",
"BUILD_STATIC": "ON" "BUILD_STATIC": "ON",
"ENABLE_WIN32_XMLLITE": "ON"
}, },
"hidden": true, "hidden": true,
"name": "mamba-static" "name": "mamba-static"

View File

@ -47,7 +47,7 @@ dependencies:
- scikit-build - scikit-build
# libmambapy dependencies # libmambapy dependencies
- python - python
- pybind11 - pybind11<3.0.0
# libmambapy-stubs build dependencies # libmambapy-stubs build dependencies
- mypy # For stubgen - mypy # For stubgen
- setuptools - setuptools

View File

@ -563,6 +563,15 @@ macro(libmamba_create_target target_name linkage output_name)
set(CMAKE_PREFIX_PATH "$ENV{VCPKG_ROOT}/installed/x64-windows-static-md/") set(CMAKE_PREFIX_PATH "$ENV{VCPKG_ROOT}/installed/x64-windows-static-md/")
# TODO AND CONTEXT: We found a link error in libarchive which lacked a link to XmlLite
# which is provided by Windows. libarchive has cmake scripts doing the necessary work to
# link that library but for some reason we couldnt identify it is not linking in this
# specific case (it was before but the version changed apparently). As a workaround we
# manually link with that required library but a better solution would be to find why
# libarchive doesnt do it itself.
set(SYSTEM_PROVIDED_LIBRARIES XmlLite.lib) # required by libarchive
set(ENABLE_WIN32_XMLLITE ON)
# For Windows we have a vcpkg based build system right now. # For Windows we have a vcpkg based build system right now.
find_package(LibArchive MODULE REQUIRED) find_package(LibArchive MODULE REQUIRED)
find_package(CURL CONFIG REQUIRED) find_package(CURL CONFIG REQUIRED)
@ -582,6 +591,7 @@ macro(libmamba_create_target target_name linkage output_name)
${target_name} ${target_name}
PUBLIC PUBLIC
${CRYPTO_LIBRARIES} ${CRYPTO_LIBRARIES}
${SYSTEM_PROVIDED_LIBRARIES}
${LibArchive_LIBRARY} ${LibArchive_LIBRARY}
${LIBXML2_LIBRARY} ${LIBXML2_LIBRARY}
${ICONV_LIBRARY} ${ICONV_LIBRARY}

View File

@ -5,6 +5,7 @@
// The full license is in the file LICENSE, distributed with this software. // The full license is in the file LICENSE, distributed with this software.
#include <array> #include <array>
#include <cassert>
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include <ranges> #include <ranges>

View File

@ -3,6 +3,11 @@
"dependencies": [ "dependencies": [
"zstd", "zstd",
"curl", "curl",
"libiconv",
{
"features": ["iconv", "lzma", "zlib"],
"name": "libxml2"
},
{ {
"name": "winreg", "name": "winreg",
"platform": "windows" "platform": "windows"