aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2021-04-11 15:12:53 +0200
committerMarvin W <git@larma.de>2021-04-11 15:13:22 +0200
commit4edab3c8d63b327dcb48799e174a3e00192721ec (patch)
treef4393a6fe2d4dab0c0fe7ae866b20faf17730f37 /plugins
parente9ff660537f7c00281395f8a001f7554e116efff (diff)
downloaddino-4edab3c8d63b327dcb48799e174a3e00192721ec.tar.gz
dino-4edab3c8d63b327dcb48799e174a3e00192721ec.zip
Fix custom vapi integration
Diffstat (limited to 'plugins')
-rw-r--r--plugins/crypto-vala/CMakeLists.txt6
-rw-r--r--plugins/ice/CMakeLists.txt10
-rw-r--r--plugins/omemo/CMakeLists.txt7
-rw-r--r--plugins/rtp/CMakeLists.txt2
4 files changed, 10 insertions, 15 deletions
diff --git a/plugins/crypto-vala/CMakeLists.txt b/plugins/crypto-vala/CMakeLists.txt
index 4a8da241..f615854c 100644
--- a/plugins/crypto-vala/CMakeLists.txt
+++ b/plugins/crypto-vala/CMakeLists.txt
@@ -1,9 +1,9 @@
find_package(GCrypt REQUIRED)
+find_package(Srtp2 REQUIRED)
find_packages(CRYPTO_VALA_PACKAGES REQUIRED
GLib
GObject
GIO
- Srtp2
)
vala_precompile(CRYPTO_VALA_C
@@ -18,8 +18,6 @@ CUSTOM_VAPIS
"${CMAKE_CURRENT_SOURCE_DIR}/vapi/libsrtp2.vapi"
PACKAGES
${CRYPTO_VALA_PACKAGES}
-OPTIONS
- --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
GENERATE_VAPI
crypto-vala
GENERATE_HEADER
@@ -29,6 +27,6 @@ GENERATE_HEADER
set(CFLAGS ${VALA_CFLAGS})
add_definitions(${CFLAGS})
add_library(crypto-vala STATIC ${CRYPTO_VALA_C})
-target_link_libraries(crypto-vala ${CRYPTO_VALA_PACKAGES} gcrypt)
+target_link_libraries(crypto-vala ${CRYPTO_VALA_PACKAGES} gcrypt libsrtp2)
set_property(TARGET crypto-vala PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/plugins/ice/CMakeLists.txt b/plugins/ice/CMakeLists.txt
index 392a202f..b18bfcc5 100644
--- a/plugins/ice/CMakeLists.txt
+++ b/plugins/ice/CMakeLists.txt
@@ -1,11 +1,11 @@
+find_package(Nice REQUIRED)
+find_package(GnuTLS REQUIRED)
find_packages(ICE_PACKAGES REQUIRED
Gee
GLib
GModule
- GnuTLS
GObject
GTK3
- Nice
)
vala_precompile(ICE_VALA_C
@@ -21,15 +21,15 @@ CUSTOM_VAPIS
${CMAKE_BINARY_DIR}/exports/dino.vapi
${CMAKE_BINARY_DIR}/exports/qlite.vapi
${CMAKE_BINARY_DIR}/exports/crypto-vala.vapi
+ ${CMAKE_CURRENT_SOURCE_DIR}/vapi/nice.vapi
+ ${CMAKE_CURRENT_SOURCE_DIR}/vapi/gnutls.vapi
PACKAGES
${ICE_PACKAGES}
-OPTIONS
- --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
)
add_definitions(${VALA_CFLAGS} -DG_LOG_DOMAIN="ice")
add_library(ice SHARED ${ICE_VALA_C})
-target_link_libraries(ice libdino crypto-vala ${ICE_PACKAGES})
+target_link_libraries(ice libdino crypto-vala ${ICE_PACKAGES} nice gnutls)
set_target_properties(ice PROPERTIES PREFIX "")
set_target_properties(ice PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins/)
diff --git a/plugins/omemo/CMakeLists.txt b/plugins/omemo/CMakeLists.txt
index 0f5a1521..c7a45069 100644
--- a/plugins/omemo/CMakeLists.txt
+++ b/plugins/omemo/CMakeLists.txt
@@ -3,13 +3,13 @@ find_package(Gettext)
include(${GETTEXT_USE_FILE})
gettext_compile(${GETTEXT_PACKAGE} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/po TARGET_NAME ${GETTEXT_PACKAGE}-translations)
+find_package(Qrencode REQUIRED)
find_packages(OMEMO_PACKAGES REQUIRED
Gee
GLib
GModule
GObject
GTK3
- Qrencode
)
set(RESOURCE_LIST
@@ -66,18 +66,17 @@ CUSTOM_VAPIS
${CMAKE_BINARY_DIR}/exports/xmpp-vala.vapi
${CMAKE_BINARY_DIR}/exports/qlite.vapi
${CMAKE_BINARY_DIR}/exports/dino.vapi
+ ${CMAKE_CURRENT_SOURCE_DIR}/vapi/libqrencode.vapi
PACKAGES
${OMEMO_PACKAGES}
GRESOURCES
${OMEMO_GRESOURCES_XML}
-OPTIONS
- --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
)
add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\" -DG_LOG_DOMAIN="OMEMO")
add_library(omemo SHARED ${OMEMO_VALA_C} ${OMEMO_GRESOURCES_TARGET})
add_dependencies(omemo ${GETTEXT_PACKAGE}-translations)
-target_link_libraries(omemo libdino signal-protocol-vala crypto-vala ${OMEMO_PACKAGES})
+target_link_libraries(omemo libdino signal-protocol-vala crypto-vala ${OMEMO_PACKAGES} libqrencode)
set_target_properties(omemo PROPERTIES PREFIX "")
set_target_properties(omemo PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins/)
diff --git a/plugins/rtp/CMakeLists.txt b/plugins/rtp/CMakeLists.txt
index 0925ff0c..76d6e66d 100644
--- a/plugins/rtp/CMakeLists.txt
+++ b/plugins/rtp/CMakeLists.txt
@@ -31,8 +31,6 @@ PACKAGES
${RTP_PACKAGES}
DEFINITIONS
${RTP_DEFINITIONS}
-OPTIONS
- --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
)
add_definitions(${VALA_CFLAGS} -DG_LOG_DOMAIN="rtp" -I${CMAKE_CURRENT_SOURCE_DIR}/src)