Skip to content

🎨 Allow GEN_STR_CATALOG to be defaulted #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2025
Merged

🎨 Allow GEN_STR_CATALOG to be defaulted #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ add_versioned_package("gh:intel/cpp-baremetal-concurrency#7c5b26c")
add_versioned_package("gh:intel/cpp-std-extensions#4d57b2e")
add_versioned_package("gh:intel/cpp-baremetal-senders-and-receivers#73d95bc")

set(GEN_STR_CATALOG
${CMAKE_CURRENT_LIST_DIR}/tools/gen_str_catalog.py
CACHE FILEPATH "Location of script to generate a string catalog")

add_library(cib_sc INTERFACE)
target_compile_features(cib_sc INTERFACE cxx_std_20)
target_link_libraries_system(cib_sc INTERFACE fmt::fmt-header-only stdx)
Expand Down
3 changes: 3 additions & 0 deletions cmake/string_catalog.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ function(gen_str_catalog)
if(SC_GUID_MASK)
set(GUID_MASK_ARG --guid_mask ${SC_GUID_MASK})
endif()
if(NOT SC_GEN_STR_CATALOG)
set(SC_GEN_STR_CATALOG ${GEN_STR_CATALOG})
endif()

add_custom_command(
OUTPUT ${SC_OUTPUT_CPP} ${SC_OUTPUT_JSON} ${SC_OUTPUT_XML}
Expand Down
2 changes: 0 additions & 2 deletions test/log/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ target_include_directories(catalog2_lib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(catalog1_lib PRIVATE warnings cib)
target_link_libraries(catalog2_lib PRIVATE warnings cib)
gen_str_catalog(
GEN_STR_CATALOG
${CMAKE_SOURCE_DIR}/tools/gen_str_catalog.py
OUTPUT_CPP
${CMAKE_CURRENT_BINARY_DIR}/strings.cpp
OUTPUT_JSON
Expand Down
Loading