folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1297 from adriendelsalle/win-full-static 

Fix CMake config for micromamba fully statically linked on Windows
This commit is contained in:
Wolf Vollprecht 2021-11-24 14:32:39 +01:00 committed by GitHub
parent 53c7ed3bf9 23c251ae5e
commit ebeed01960
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmamba/CMakeLists.txt
View File

@ -287,7 +287,7 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
find_library(CHARSET_LIBRARY NAMES libcharset)
message("Found: ${LIBXML2_LIBRARY} ${ICONV_LIBRARY} ${CHARSET_LIBRARY}")
target_link_libraries(${target_name} PRIVATE
target_link_libraries(${target_name} PUBLIC
${CRYPTO_LIBRARIES}
${LibArchive_LIBRARY}
${LIBXML2_LIBRARY}

3
micromamba/CMakeLists.txt
View File

@ -61,6 +61,9 @@ message(STATUS "Micromamba linkage: ${MICROMAMBA_LINKAGE}")
if (${MICROMAMBA_LINKAGE} STREQUAL "FULL_STATIC")
target_link_libraries(micromamba PRIVATE libmamba-full-static)
if (WIN32)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
endif ()
elseif (${MICROMAMBA_LINKAGE} STREQUAL "STATIC")
target_link_libraries(micromamba PRIVATE libmamba-static)
else ()