|
1 | 1 | diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt
|
2 |
| -index 16716339..72dcfd1f 100644 |
| 2 | +index 5fe133ce..7e9dcaf6 100644 |
3 | 3 | --- a/libmamba/CMakeLists.txt
|
4 | 4 | +++ 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) |
6 | 6 | SPDLOG_FMT_EXTERNAL "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${BUILD_LOG_LEVEL}"
|
7 | 7 | )
|
8 | 8 |
|
@@ -100,7 +100,7 @@ index 16716339..72dcfd1f 100644
|
100 | 100 | - set(CMAKE_PREFIX_PATH "$ENV{VCPKG_ROOT}/installed/x64-windows-static-md/")
|
101 | 101 | -
|
102 | 102 | - # For Windows we have a vcpkg based build system right now.
|
103 |
| -- find_package(LibArchive REQUIRED) |
| 103 | +- find_package(LibArchive MODULE REQUIRED) |
104 | 104 | - find_package(CURL CONFIG REQUIRED)
|
105 | 105 | - find_library(LIBLZMA_LIBRARIES lzma REQUIRED)
|
106 | 106 | - find_library(LZ4_LIBRARY NAMES lz4)
|
@@ -170,6 +170,9 @@ index 16716339..72dcfd1f 100644
|
170 | 170 | - solv::libsolvext
|
171 | 171 | - solv::cpp
|
172 | 172 | - )
|
| 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}") |
173 | 176 | - endif()
|
174 | 177 | + message(" -> Using shared libraries for libmamba dependencies")
|
175 | 178 | + find_package(CURL REQUIRED)
|
|
0 commit comments