From b219842b285f30f8a47f81ec96e1d703390a384a Mon Sep 17 00:00:00 2001 From: Hind-M <70631848+Hind-M@users.noreply.github.com> Date: Thu, 26 Sep 2024 21:50:41 +0200 Subject: [PATCH] Apply feedstock patches (#3466) --- libmamba/CMakeLists.txt | 4 ++-- mamba_package/CMakeLists.txt | 3 --- micromamba/CMakeLists.txt | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt index 0738731695..c64f55ffc4 100644 --- a/libmamba/CMakeLists.txt +++ b/libmamba/CMakeLists.txt @@ -453,8 +453,8 @@ macro(libmamba_create_target target_name linkage output_name) find_library(BZIP2_LIBRARIES NAMES bz2) find_library(CRYPTO_LIBRARIES NAMES libcrypto) - find_library(LIBSOLV_BUILD_STATICRARIES NAMES solv) - find_library(LIBSOLVEXT_BUILD_STATICRARIES NAMES solvext) + find_library(LIBSOLV_BUILD_STATICRARIES NAMES solv_static) + find_library(LIBSOLVEXT_BUILD_STATICRARIES NAMES solvext_static) find_package(reproc++ CONFIG REQUIRED) find_library(LIBXML2_LIBRARY NAMES libxml2) diff --git a/mamba_package/CMakeLists.txt b/mamba_package/CMakeLists.txt index ec24f7187b..c61e9fdef9 100644 --- a/mamba_package/CMakeLists.txt +++ b/mamba_package/CMakeLists.txt @@ -49,9 +49,6 @@ mamba_target_add_compile_warnings(mamba-package WARNING_AS_ERROR ${MAMBA_WARNING if (${MAMBA_PACKAGE_LINKAGE} STREQUAL "STATIC") target_link_libraries(mamba-package PRIVATE libmamba-static) - if (WIN32) - set_target_properties(mamba-package PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") - endif () else () target_link_libraries(mamba-package PRIVATE libmamba) endif () diff --git a/micromamba/CMakeLists.txt b/micromamba/CMakeLists.txt index 8264b795e6..e223ed1232 100644 --- a/micromamba/CMakeLists.txt +++ b/micromamba/CMakeLists.txt @@ -77,9 +77,6 @@ message(STATUS "Micromamba linkage: ${MICROMAMBA_LINKAGE}") if (${MICROMAMBA_LINKAGE} STREQUAL "STATIC") target_link_libraries(micromamba PRIVATE libmamba-static) - if (WIN32) - set_target_properties(micromamba PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") - endif () else () target_link_libraries(micromamba PRIVATE libmamba) endif ()