mirror of https://github.com/mamba-org/mamba.git
fix CI issues related to moving dependencies (#4023)
This commit is contained in:
parent
14a94d379a
commit
ec62904617
|
@ -23,7 +23,8 @@
|
|||
{
|
||||
"cacheVariables": {
|
||||
"BUILD_MICROMAMBA": "ON",
|
||||
"BUILD_STATIC": "ON"
|
||||
"BUILD_STATIC": "ON",
|
||||
"ENABLE_WIN32_XMLLITE": "ON"
|
||||
},
|
||||
"hidden": true,
|
||||
"name": "mamba-static"
|
||||
|
|
|
@ -47,7 +47,7 @@ dependencies:
|
|||
- scikit-build
|
||||
# libmambapy dependencies
|
||||
- python
|
||||
- pybind11
|
||||
- pybind11<3.0.0
|
||||
# libmambapy-stubs build dependencies
|
||||
- mypy # For stubgen
|
||||
- setuptools
|
||||
|
|
|
@ -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/")
|
||||
|
||||
# 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.
|
||||
find_package(LibArchive MODULE REQUIRED)
|
||||
find_package(CURL CONFIG REQUIRED)
|
||||
|
@ -582,6 +591,7 @@ macro(libmamba_create_target target_name linkage output_name)
|
|||
${target_name}
|
||||
PUBLIC
|
||||
${CRYPTO_LIBRARIES}
|
||||
${SYSTEM_PROVIDED_LIBRARIES}
|
||||
${LibArchive_LIBRARY}
|
||||
${LIBXML2_LIBRARY}
|
||||
${ICONV_LIBRARY}
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
// The full license is in the file LICENSE, distributed with this software.
|
||||
|
||||
#include <array>
|
||||
#include <cassert>
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <ranges>
|
||||
|
|
|
@ -3,6 +3,11 @@
|
|||
"dependencies": [
|
||||
"zstd",
|
||||
"curl",
|
||||
"libiconv",
|
||||
{
|
||||
"features": ["iconv", "lzma", "zlib"],
|
||||
"name": "libxml2"
|
||||
},
|
||||
{
|
||||
"name": "winreg",
|
||||
"platform": "windows"
|
||||
|
|
Loading…
Reference in New Issue