From a320ff2ae7cd38045113218d83fbdfd19c0a64b1 Mon Sep 17 00:00:00 2001 From: link2xt Date: Tue, 23 Feb 2021 23:06:50 +0300 Subject: Do not build libdeltachat as ExternalProject deltachat-core-rust has CMakeLists.txt now and can be used as a module within `kdesrc-build`. The recommended way for building KDeltaChat is using `kdesrc-build` now, README is updated accordingly. --- CMakeLists.txt | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index e380217..7585475 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,19 +13,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Widgets Quick REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Widgets Quick REQUIRED) - -include(ExternalProject) -ExternalProject_Add( - deltachat-core-rust - SOURCE_DIR "${CMAKE_SOURCE_DIR}/../deltachat-core-rust" - BUILD_IN_SOURCE 1 - BUILD_COMMAND env PREFIX= cargo build -p deltachat_ffi -j 1 - BUILD_ALWAYS 1 - BUILD_BYPRODUCTS /target/debug/libdeltachat.a - CONFIGURE_COMMAND "" - INSTALL_COMMAND cp /target/debug/libdeltachat.a /libdeltachat.a - COMMAND cp /deltachat-ffi/deltachat.h /deltachat.h -) +find_package(PkgConfig REQUIRED) add_executable(kdeltachat main.cpp @@ -41,9 +29,9 @@ add_executable(kdeltachat qml.qrc ) -add_dependencies(kdeltachat deltachat-core-rust) find_package(Threads REQUIRED) find_package(KF5Kirigami2) +pkg_check_modules(DeltaChat IMPORTED_TARGET deltachat) target_compile_definitions(kdeltachat PRIVATE $<$,$>:QT_QML_DEBUG>) @@ -51,7 +39,5 @@ target_link_libraries(kdeltachat PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::Widgets PRIVATE Threads::Threads PRIVATE KF5::Kirigami2 - PRIVATE "${CMAKE_BINARY_DIR}/deltachat-core-rust-prefix/libdeltachat.a" + PRIVATE PkgConfig::DeltaChat m dl) -target_include_directories(kdeltachat - PRIVATE "${CMAKE_BINARY_DIR}/deltachat-core-rust-prefix/") -- cgit v1.2.3-70-g09d2