From 65ee9e8886534629326801e9157e9b1868413b7d Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 1 Dec 2021 18:49:12 +0100 Subject: [PATCH] build: add internal otr dependency We need to add the header files to the include dir conditionally too. --- meson.build | 1 + src/meson.build | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index aecfff02..3d5e0d71 100644 --- a/meson.build +++ b/meson.build @@ -106,6 +106,7 @@ profanity = executable('profanity', curses_dep, notify_dep, otr_dep, + otr_internal_dep, pgp_dep, omemo_libsignal_dep, omemo_gcrypt_dep, diff --git a/src/meson.build b/src/meson.build index c03ebe58..dc17f3b8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -83,11 +83,11 @@ if pgp_dep.found() sources += 'src/pgp/gpg.c' endif +otr_internal_dep = declare_dependency() if otr_dep.found() otr_sources = [ 'src/otr/otrlibv4.c', - 'src/otr/otr.c', - ] - incdir += include_directories('otr') + 'src/otr/otr.c', + ] - sources += otr_sources + otr_internal_dep = declare_dependency(sources: otr_sources, include_directories: include_directories('otr'), dependencies: otr_dep) endif