Skip to content

Commit 54741fd

Browse files
committed
🎨 Split log, fmt and mipi impls into separate libraries
1 parent 22aa497 commit 54741fd

File tree

2 files changed

+53
-25
lines changed

2 files changed

+53
-25
lines changed

CMakeLists.txt

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,38 @@ target_sources(
117117
include/lookup/strategies.hpp
118118
include/lookup/strategy_failed.hpp)
119119

120+
add_library(cib_log INTERFACE)
121+
target_compile_features(cib_log INTERFACE cxx_std_20)
122+
target_link_libraries_system(cib_log INTERFACE cib_sc stdx)
123+
124+
target_sources(
125+
cib_log
126+
INTERFACE FILE_SET
127+
log
128+
TYPE
129+
HEADERS
130+
BASE_DIRS
131+
include
132+
FILES
133+
include/log/level.hpp
134+
include/log/log.hpp)
135+
136+
add_library(cib_log_fmt INTERFACE)
137+
target_compile_features(cib_log_fmt INTERFACE cxx_std_20)
138+
target_link_libraries_system(cib_log_fmt INTERFACE cib_log fmt::fmt-header-only
139+
stdx)
140+
141+
target_sources(
142+
cib_log_fmt
143+
INTERFACE FILE_SET
144+
log
145+
TYPE
146+
HEADERS
147+
BASE_DIRS
148+
include
149+
FILES
150+
include/log/fmt/logger.hpp)
151+
120152
add_library(cib INTERFACE)
121153
target_compile_features(cib INTERFACE cxx_std_20)
122154
target_link_libraries_system(
@@ -178,21 +210,6 @@ target_sources(
178210
include/flow/run.hpp
179211
include/flow/step.hpp)
180212

181-
target_sources(
182-
cib
183-
INTERFACE FILE_SET
184-
log
185-
TYPE
186-
HEADERS
187-
BASE_DIRS
188-
include
189-
FILES
190-
include/log/catalog/catalog.hpp
191-
include/log/catalog/mipi_encoder.hpp
192-
include/log/fmt/logger.hpp
193-
include/log/level.hpp
194-
include/log/log.hpp)
195-
196213
target_sources(
197214
cib
198215
INTERFACE FILE_SET
@@ -231,6 +248,23 @@ target_sources(
231248
include/seq/impl.hpp
232249
include/seq/step.hpp)
233250

251+
add_library(cib_log_mipi INTERFACE)
252+
target_compile_features(cib_log_mipi INTERFACE cxx_std_20)
253+
target_link_libraries_system(cib_log_mipi INTERFACE cib cib_log concurrency
254+
stdx)
255+
256+
target_sources(
257+
cib_log_mipi
258+
INTERFACE FILE_SET
259+
log
260+
TYPE
261+
HEADERS
262+
BASE_DIRS
263+
include
264+
FILES
265+
include/log/catalog/catalog.hpp
266+
include/log/catalog/mipi_encoder.hpp)
267+
234268
if(PROJECT_IS_TOP_LEVEL)
235269
add_docs(docs)
236270
clang_tidy_interface(cib)

test/log/CMakeLists.txt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
add_tests(
2-
FILES
3-
fmt_logger
4-
log
5-
mipi_encoder
6-
mipi_logger
7-
module_id
8-
LIBRARIES
9-
cib)
1+
add_tests(FILES log module_id LIBRARIES cib_log)
2+
add_tests(FILES fmt_logger LIBRARIES cib_log_fmt)
3+
add_tests(FILES mipi_encoder mipi_logger LIBRARIES cib_log_mipi)
104

115
add_library(catalog1_lib STATIC catalog1_lib.cpp)
126
add_library(catalog2_lib OBJECT catalog2a_lib.cpp catalog2b_lib.cpp)
@@ -51,7 +45,7 @@ add_unit_test(
5145
catalog_app.cpp
5246
LIBRARIES
5347
warnings
54-
cib
48+
cib_log_mipi
5549
catalog1_lib
5650
catalog2_lib
5751
catalog_strings)

0 commit comments

Comments
 (0)