mirror of https://github.com/mamba-org/mamba.git
Merge 35c76feadb
into 4185322d51
This commit is contained in:
commit
eb87f11b44
|
@ -479,8 +479,9 @@ macro(libmamba_create_target target_name linkage output_name)
|
|||
|
||||
target_link_libraries(
|
||||
${target_name}
|
||||
PUBLIC fmt::fmt-header-only spdlog::spdlog_header_only yaml-cpp::yaml-cpp
|
||||
PUBLIC fmt::fmt-header-only yaml-cpp::yaml-cpp
|
||||
PRIVATE
|
||||
spdlog::spdlog_header_only
|
||||
reproc
|
||||
reproc++
|
||||
simdjson::simdjson_static
|
||||
|
@ -622,16 +623,12 @@ macro(libmamba_create_target target_name linkage output_name)
|
|||
|
||||
target_link_libraries(
|
||||
${target_name}
|
||||
PUBLIC
|
||||
${LIBSOLV_LIBRARIES}
|
||||
${LIBSOLVEXT_LIBRARIES}
|
||||
yaml-cpp::yaml-cpp
|
||||
fmt::fmt
|
||||
PUBLIC ${LIBSOLV_LIBRARIES} ${LIBSOLVEXT_LIBRARIES} yaml-cpp::yaml-cpp fmt::fmt
|
||||
PRIVATE
|
||||
# Since conda-forge spdlog is built with a bundled version of fmt we use the header
|
||||
# only version to avoid chasing after the correct fmt version matching the one used
|
||||
# in the bundle
|
||||
spdlog::spdlog_header_only
|
||||
PRIVATE
|
||||
${LibArchive_LIBRARIES}
|
||||
${CURL_LIBRARIES}
|
||||
${OPENSSL_LIBRARIES}
|
||||
|
|
|
@ -23,7 +23,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR};${CMAKE_MODULE_PATH}")
|
|||
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(fmt)
|
||||
find_dependency(spdlog)
|
||||
find_dependency(tl-expected)
|
||||
find_dependency(nlohmann_json)
|
||||
find_dependency(yaml-cpp)
|
||||
|
|
Loading…
Reference in New Issue