Skip to content

Commit 1482664

Browse files
committed
refresh patch for 2.0.4
Signed-off-by: dann frazier <[email protected]>
1 parent 76d393b commit 1482664

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

libmamba/support-shared-libs.patch

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt
2-
index 16716339..72dcfd1f 100644
2+
index 5fe133ce..7e9dcaf6 100644
33
--- a/libmamba/CMakeLists.txt
44
+++ b/libmamba/CMakeLists.txt
5-
@@ -445,171 +445,29 @@ macro(libmamba_create_target target_name linkage output_name)
5+
@@ -453,174 +453,29 @@ macro(libmamba_create_target target_name linkage output_name)
66
SPDLOG_FMT_EXTERNAL "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${BUILD_LOG_LEVEL}"
77
)
88

@@ -100,7 +100,7 @@ index 16716339..72dcfd1f 100644
100100
- set(CMAKE_PREFIX_PATH "$ENV{VCPKG_ROOT}/installed/x64-windows-static-md/")
101101
-
102102
- # For Windows we have a vcpkg based build system right now.
103-
- find_package(LibArchive REQUIRED)
103+
- find_package(LibArchive MODULE REQUIRED)
104104
- find_package(CURL CONFIG REQUIRED)
105105
- find_library(LIBLZMA_LIBRARIES lzma REQUIRED)
106106
- find_library(LZ4_LIBRARY NAMES lz4)
@@ -170,6 +170,9 @@ index 16716339..72dcfd1f 100644
170170
- solv::libsolvext
171171
- solv::cpp
172172
- )
173+
- # CMake 3.17 provides a LibArchive::LibArchive target that could be used instead of
174+
- # LIBRARIES/INCLUDE_DIRS
175+
- target_include_directories(${target_name} PRIVATE "${LibArchive_INCLUDE_DIRS}")
173176
- endif()
174177
+ message(" -> Using shared libraries for libmamba dependencies")
175178
+ find_package(CURL REQUIRED)

0 commit comments

Comments
 (0)