Apply feedstock patches (#3466)

mamba-org · Sep 26, 2024 · b219842 · b219842
1 parent e89127e
commit b219842
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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$<$<CONFIG:Debug>:Debug>")
-    endif ()
 else ()
     target_link_libraries(mamba-package PRIVATE libmamba)
 endif ()

diff --git 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$<$<CONFIG:Debug>:Debug>")
-    endif ()
 else ()
     target_link_libraries(micromamba PRIVATE libmamba)
 endif ()