1
1
diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt
2
- index a78d0dc..407e3b1 100644
2
+ index f592db2..22b1f40 100644
3
3
--- a/libmamba/CMakeLists.txt
4
4
+++ b/libmamba/CMakeLists.txt
5
- @@ -201 ,36 +201 ,29 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
5
+ @@ -263 ,36 +263 ,29 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
6
6
libcurl.a
7
7
libssh2.a
8
8
@@ -44,7 +44,7 @@ index a78d0dc..407e3b1 100644
44
44
set(STATIC_DEPS "")
45
45
foreach(LIB ${REQUIRED_STATIC_DEPS})
46
46
set(TMP_LIB "${LIB}-NOTFOUND")
47
- @@ -243 ,8 +236 ,9 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
47
+ @@ -305 ,8 +298 ,9 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
48
48
if (APPLE)
49
49
find_library(SECURITY_LIBRARY Security)
50
50
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
@@ -56,7 +56,7 @@ index a78d0dc..407e3b1 100644
56
56
endif()
57
57
58
58
message(" -> Found static dependencies:")
59
- @@ -267,48 +261,34 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
59
+ @@ -329,19 +323,16 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
60
60
set(CMAKE_PREFIX_PATH "$ENV{VCPKG_ROOT}/installed/x64-windows-static/")
61
61
62
62
# For Windows we have a vcpkg based build system right now.
@@ -74,18 +74,16 @@ index a78d0dc..407e3b1 100644
74
74
-
75
75
- find_library(LIBSOLV_BUILD_STATICRARIES NAMES solv_static)
76
76
- find_library(LIBSOLVEXT_BUILD_STATICRARIES NAMES solvext_static)
77
- - find_package(reproc++ CONFIG REQUIRED)
77
+ +
78
78
+ find_library(LIBZSTD_LIBRARY NAMES zstd_static.lib)
79
79
+ find_library(BZIP2_LIBRARIES NAMES bz2.lib)
80
80
+ find_library(CRYPTO_LIBRARIES NAMES libcrypto_static)
81
-
82
- - find_library(LIBXML2_LIBRARY NAMES libxml2)
83
- - find_library(ICONV_LIBRARY NAMES libiconv)
84
- - find_library(CHARSET_LIBRARY NAMES libcharset)
85
- - message("Found: ${LIBXML2_LIBRARY} ${ICONV_LIBRARY} ${CHARSET_LIBRARY}")
86
81
+ find_library(LIBSOLV_STATIC_LIBRARIES NAMES solv_static)
87
82
+ find_library(LIBSOLVEXT_STATIC_LIBRARIES NAMES solvext_static)
88
- + find_package(reproc++ CONFIG REQUIRED)
83
+ find_package(reproc++ CONFIG REQUIRED)
84
+ find_package(tl-expected REQUIRED)
85
+
86
+ @@ -352,27 +343,21 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
89
87
90
88
target_link_libraries(${target_name} PUBLIC
91
89
${CRYPTO_LIBRARIES}
@@ -111,6 +109,7 @@ index a78d0dc..407e3b1 100644
111
109
+ ${LIBSOLVEXT_STATIC_LIBRARIES}
112
110
reproc++
113
111
- reproc
112
+ tl::expected
114
113
)
115
114
116
115
- add_definitions("-DLIBARCHIVE_STATIC -DCURL_STATICLIB -DSOLV_BUILD_STATIC")
0 commit comments