Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix disabling of vendoring in CMakeLists.txt

Browse Source
This commit is contained in:
link2xt
2021-05-02 16:47:44 +03:00
parent f52c23d1c7
commit 8e9d8ae1ec
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -8,8 +8,18 @@ add_custom_command(
"target/release/libdeltachat.a" "target/release/libdeltachat.a"
"target/release/libdeltachat.so" "target/release/libdeltachat.so"
"target/release/pkgconfig/deltachat.pc" "target/release/pkgconfig/deltachat.pc"
COMMAND PREFIX=${CMAKE_INSTALL_PREFIX} ${CARGO} build --package deltachat_ffi --release --no-default-features COMMAND PREFIX=${CMAKE_INSTALL_PREFIX} ${CARGO} build --release --no-default-features
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
# Build in `deltachat-ffi` directory instead of using
# `--package deltachat_ffi` to avoid feature resolver version
# "1" bug which makes `--no-default-features` affect only
# `deltachat`, but not `deltachat-ffi` package.
#
# We can't enable version "2" resolver [1] because it is not
# stable yet on rust 1.50.0.
#
# [1] https://doc.rust-lang.org/nightly/cargo/reference/features.html#resolver-version-2-command-line-flags
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deltachat-ffi
) )
add_custom_target( add_custom_target(