Skip to content

Commit 3228dd8

Browse files
committed
cmake fixes to link libmamba-spdlog
1 parent ea20004 commit 3228dd8

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

.github/workflows/brew.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
4646
- name: Configure to build mamba
4747
run: >
48-
cmake -S. -Bbuild -DBUILD_LIBMAMBA=ON -DBUILD_MAMBA=ON -DBUILD_SHARED=ON -DBUILD_STATIC=OFF
48+
cmake -S. -Bbuild -DBUILD_LIBMAMBA=ON -DBUILD_LIBMAMBA_SPDLOG=ON -DBUILD_MAMBA=ON -DBUILD_SHARED=ON -DBUILD_STATIC=OFF
4949
-DLibArchive_ROOT=$(brew --prefix libarchive)
5050
5151
- name: Build mamba

.github/workflows/coverage.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
5555
-D CMAKE_C_COMPILER_LAUNCHER=sccache \
5656
-D MAMBA_WARNING_AS_ERROR=ON \
57+
-D BUILD_LIBMAMBA_SPDLOG=ON \
5758
-D BUILD_LIBMAMBAPY=ON \
5859
-D BUILD_MICROMAMBA=ON \
5960
-D ENABLE_MAMBA_ROOT_PREFIX_FALLBACK=OFF \

.github/workflows/static_build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ jobs:
185185
-D CMAKE_BUILD_TYPE="Release" ^
186186
-D BUILD_LIBMAMBA=ON ^
187187
-D BUILD_STATIC=ON ^
188+
-D BUILD_LIBMAMBA_SPDLOG=ON ^
188189
-D BUILD_MICROMAMBA=ON
189190
if %errorlevel% neq 0 exit /b %errorlevel%
190191
cmake --build build/ --parallel

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if(BUILD_LIBMAMBA)
7878
endif()
7979

8080
# libmamba-spdlog library and tests
81-
if(BUILD_LIBMAMBA_SPDLOG)
81+
if(BUILD_LIBMAMBA_SPDLOG OR BUILD_LIBMAMBAPY OR BUILD_MICROMAMBA OR BUILD_MAMBA)
8282
add_subdirectory(libmamba-spdlog)
8383
endif()
8484

libmamba-spdlog/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ find_package(Catch2 REQUIRED)
55
add_executable( test_libmamba_logging_spdlog test_logging_spdlog.cpp )
66

77
target_link_libraries(test_libmamba_logging_spdlog
8-
PRIVATE
8+
PUBLIC
99
mamba::libmamba
1010
mamba::libmamba-spdlog
1111
mamba::libtesting_mamba_logging_common

0 commit comments

Comments
 (0)