afiqzudinhadi/zmk-javelin-steno
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: compile all C++ (including bridge) in javelin_steno library for C++23

Browse source
This commit is contained in:
afiqzudinhadi 2026-06-22 23:43:59 +08:00
parent 95e73ee2b8
commit 358cba1704
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -215,10 +215,9 @@ print(f'Stripped test blocks from {count} files')
${ZMK_INIT_SRC} ${ZMK_INIT_SRC}
) )
# Build Javelin as a separate static library so we can control # Build everything as a Zephyr library for C++23.
# C++ standard without Zephyr's -std=c++11 interfering.
zephyr_library_named(javelin_steno) zephyr_library_named(javelin_steno)
zephyr_library_sources(${JAVELIN_LIB_SRC}) zephyr_library_sources(${JAVELIN_LIB_SRC} ${ZMK_BRIDGE_SRC})
zephyr_library_compile_options( zephyr_library_compile_options(
-std=gnu++23 -std=gnu++23
-fno-exceptions -fno-exceptions
@ -237,14 +236,8 @@ print(f'Stripped test blocks from {count} files')
# Test suppression handled by include/javelin_overrides/unit_test.h # Test suppression handled by include/javelin_overrides/unit_test.h
# which shadows Javelin's unit_test.h via include path ordering. # which shadows Javelin's unit_test.h via include path ordering.
# Bridge sources (C++ with ZMK headers) compiled into app target
set_source_files_properties(${ZMK_BRIDGE_SRC} PROPERTIES
COMPILE_FLAGS "-std=gnu++23 -fno-exceptions -fno-rtti -fno-threadsafe-statics -fpermissive"
)
target_sources(app PRIVATE target_sources(app PRIVATE
${ZMK_BEHAVIOR_SRC} ${ZMK_BEHAVIOR_SRC}
${ZMK_BRIDGE_SRC}
) )
# Dictionary binary embedding. # Dictionary binary embedding.