Skip to content

Commit 448511e

Browse files
committed
attempt to fix libmambapy not finding libmamba-spdlog
1 parent 7465127 commit 448511e

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

libmamba-spdlog/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,6 @@ set_target_properties(
6060
CXX_EXTENSIONS NO
6161
)
6262

63-
64-
# install(
65-
# EXPORT ${PROJECT_NAME}Targets
66-
# NAMESPACE mamba::
67-
# DESTINATION ${LIBMAMBA_CMAKECONFIG_INSTALL_DIR}
68-
# COMPONENT Mamba_Development
69-
# )
70-
# export(EXPORT ${PROJECT_NAME}Targets NAMESPACE mamba::)
71-
7263
if(BUILD_LIBMAMBA_SPDLOG_TESTS)
7364
add_subdirectory(tests/)
7465
endif()

libmambapy/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ project(libmambapy)
1111

1212
if(NOT TARGET mamba::libmamba)
1313
find_package(libmamba CONFIG REQUIRED)
14-
set(libmamba_target mamba::libmamba-dyn)
15-
else()
16-
set(libmamba_target mamba::libmamba)
14+
endif()
15+
16+
if(NOT TARGET mamba::libmamba-spdlog)
17+
find_package(libmamba-spdlog CONFIG REQUIRED)
1718
endif()
1819

1920
find_package(Python COMPONENTS Interpreter Development.Module)
@@ -48,7 +49,7 @@ target_include_directories(bindings PRIVATE bindings)
4849

4950
mamba_target_add_compile_warnings(bindings WARNING_AS_ERROR ${MAMBA_WARNING_AS_ERROR})
5051

51-
target_link_libraries(bindings PRIVATE pybind11::pybind11 ${libmamba_target} mamba::libmamba-spdlog)
52+
target_link_libraries(bindings PRIVATE pybind11::pybind11 mamba::libmamba mamba::libmamba-spdlog)
5253
target_compile_features(bindings PUBLIC cxx_std_20)
5354
set_target_properties(
5455
bindings

0 commit comments

Comments
 (0)