Skip to content
Snippets Groups Projects
Commit 6bb307bd authored by Vladimir Stoiakin's avatar Vladimir Stoiakin Committed by Vladimir Stoiakin
Browse files

meson: update the list of sources and dependencies

Change-Id: I6b419ff3e1bc4f8dd8958974e4ae4bc98d30cf06
parent e89bf172
No related branches found
No related tags found
No related merge requests found
...@@ -14,6 +14,7 @@ modcmake = import('cmake') ...@@ -14,6 +14,7 @@ modcmake = import('cmake')
depthreads = dependency('threads') depthreads = dependency('threads')
depopendht = dependency('opendht', version: '>= 2.1.0') depopendht = dependency('opendht', version: '>= 2.1.0')
depgnutls = dependency('gnutls', version: '>= 3.6.7') depgnutls = dependency('gnutls', version: '>= 3.6.7')
depnettle = dependency('nettle', version: '>= 3.0.0')
deplibpjproject = dependency('libpjproject') deplibpjproject = dependency('libpjproject')
deplibgit2 = dependency('libgit2', version: '>= 1.1.0') deplibgit2 = dependency('libgit2', version: '>= 1.1.0')
deplibsecp256k1 = dependency('libsecp256k1', version: '>= 0.1') deplibsecp256k1 = dependency('libsecp256k1', version: '>= 0.1')
...@@ -129,6 +130,9 @@ endif ...@@ -129,6 +130,9 @@ endif
if get_option('plugins') if get_option('plugins')
conf.set('ENABLE_PLUGIN', true) conf.set('ENABLE_PLUGIN', true)
if host_machine.system() == 'darwin'
depminizip = dependency('minizip', version: '>= 3.0.0')
else
deplibarchive = dependency('libarchive', version: '>= 3.4.0', required: false) deplibarchive = dependency('libarchive', version: '>= 3.4.0', required: false)
if not deplibarchive.found() if not deplibarchive.found()
deplibarchive = modcmake.subproject('libarchive', cmake_options: [ deplibarchive = modcmake.subproject('libarchive', cmake_options: [
...@@ -141,6 +145,7 @@ if get_option('plugins') ...@@ -141,6 +145,7 @@ if get_option('plugins')
'-DENABLE_LIBXML2=OFF' '-DENABLE_LIBXML2=OFF'
]).dependency('archive_static') ]).dependency('archive_static')
endif endif
endif
depdl = meson.get_compiler('cpp').find_library('dl', required: false) depdl = meson.get_compiler('cpp').find_library('dl', required: false)
else else
conf.set('ENABLE_PLUGIN', false) conf.set('ENABLE_PLUGIN', false)
......
...@@ -39,6 +39,7 @@ libjami_sources = files( ...@@ -39,6 +39,7 @@ libjami_sources = files(
'jamidht/server_account_manager.cpp', 'jamidht/server_account_manager.cpp',
'jamidht/sync_channel_handler.cpp', 'jamidht/sync_channel_handler.cpp',
'jamidht/sync_module.cpp', 'jamidht/sync_module.cpp',
'jamidht/transfer_channel_handler.cpp',
'media/audio/echo-cancel/null_echo_canceller.cpp', 'media/audio/echo-cancel/null_echo_canceller.cpp',
'media/audio/sound/audiofile.cpp', 'media/audio/sound/audiofile.cpp',
'media/audio/sound/dtmf.cpp', 'media/audio/sound/dtmf.cpp',
...@@ -130,6 +131,7 @@ libjami_dependencies = [ ...@@ -130,6 +131,7 @@ libjami_dependencies = [
depthreads, depthreads,
depopendht, depopendht,
depgnutls, depgnutls,
depnettle,
deplibpjproject, deplibpjproject,
deplibgit2, deplibgit2,
deplibsecp256k1, deplibsecp256k1,
...@@ -298,7 +300,12 @@ if conf.get('ENABLE_PLUGIN') ...@@ -298,7 +300,12 @@ if conf.get('ENABLE_PLUGIN')
'plugin/pluginpreferencesutils.cpp', 'plugin/pluginpreferencesutils.cpp',
'plugin/pluginsutils.cpp' 'plugin/pluginsutils.cpp'
) )
libjami_dependencies += [deplibarchive, depdl] if host_machine.system() == 'darwin'
libjami_dependencies += depminizip
else
libjami_dependencies += deplibarchive
endif
libjami_dependencies += depdl
endif endif
libjami = library('jami', libjami = library('jami',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment