Skip to content

Port to mxml4 #56

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

Open
khaddra wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Port to mxml4 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c8620c
port to mxml4
khaddra Oct 27, 2025
16cea12
fix some issues discovered when using with lurch
khaddra Oct 28, 2025
25239b7
allow sending apostrophes
khaddra Oct 28, 2025
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
10 changes: 5 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ if(OMEMO_WITH_TESTS)
endif()
pkg_check_modules(GLIB REQUIRED "glib-2.0")
pkg_check_modules(GCRYPT REQUIRED "libgcrypt")
pkg_check_modules(MXML REQUIRED "mxml")
pkg_check_modules(MXML4 REQUIRED "mxml4")
pkg_check_modules(SQLITE REQUIRED "sqlite3")


Expand Down Expand Up @@ -168,8 +168,8 @@ foreach(_target omemo ${_OMEMO_TEST_TARGETS})

# TODO: Tests should stop depending on mxml
# once the tests stop including libomemo's .c(!) files
target_compile_options(${_target} PRIVATE ${MXML_CFLAGS})
target_link_libraries(${_target} PRIVATE ${MXML_LIBRARIES})
target_compile_options(${_target} PRIVATE ${MXML4_CFLAGS})
target_link_libraries(${_target} PRIVATE ${MXML4_LIBRARIES})

target_compile_options(${_target} PRIVATE ${SQLITE_CFLAGS})
target_link_libraries(${_target} PRIVATE ${SQLITE_LIBRARIES})
Expand All @@ -184,8 +184,8 @@ foreach(_target omemo ${_OMEMO_TEST_TARGETS})

# TODO: Tests should stop depending on mxml
# once the tests stop including libomemo's .c(!) files
target_compile_options(${_target} PRIVATE ${MXML_STATIC_CFLAGS})
target_link_libraries(${_target} PRIVATE ${MXML_STATIC_LIBRARIES})
target_compile_options(${_target} PRIVATE ${MXML4_STATIC_CFLAGS})
target_link_libraries(${_target} PRIVATE ${MXML4_STATIC_LIBRARIES})

target_compile_options(${_target} PRIVATE ${SQLITE_STATIC_CFLAGS})
target_link_libraries(${_target} PRIVATE ${SQLITE_STATIC_LIBRARIES})
Expand Down
Loading