Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
6bb307bd
Commit
6bb307bd
authored
3 years ago
by
Vladimir Stoiakin
Committed by
Vladimir Stoiakin
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
meson: update the list of sources and dependencies
Change-Id: I6b419ff3e1bc4f8dd8958974e4ae4bc98d30cf06
parent
e89bf172
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
meson.build
+16
-11
16 additions, 11 deletions
meson.build
src/meson.build
+8
-1
8 additions, 1 deletion
src/meson.build
with
24 additions
and
12 deletions
meson.build
+
16
−
11
View file @
6bb307bd
...
...
@@ -14,6 +14,7 @@ modcmake = import('cmake')
depthreads
=
dependency
(
'threads'
)
depopendht
=
dependency
(
'opendht'
,
version
:
'>= 2.1.0'
)
depgnutls
=
dependency
(
'gnutls'
,
version
:
'>= 3.6.7'
)
depnettle
=
dependency
(
'nettle'
,
version
:
'>= 3.0.0'
)
deplibpjproject
=
dependency
(
'libpjproject'
)
deplibgit2
=
dependency
(
'libgit2'
,
version
:
'>= 1.1.0'
)
deplibsecp256k1
=
dependency
(
'libsecp256k1'
,
version
:
'>= 0.1'
)
...
...
@@ -129,17 +130,21 @@ endif
if
get_option
(
'plugins'
)
conf
.
set
(
'ENABLE_PLUGIN'
,
true
)
deplibarchive
=
dependency
(
'libarchive'
,
version
:
'>= 3.4.0'
,
required
:
false
)
if
not
deplibarchive
.
found
()
deplibarchive
=
modcmake
.
subproject
(
'libarchive'
,
cmake_options
:
[
'-DCMAKE_BUILD_TYPE=Release'
,
'-DCMAKE_POSITION_INDEPENDENT_CODE=ON'
,
'-DENABLE_TEST=OFF'
,
'-DENABLE_TAR=OFF'
,
'-DENABLE_CPIO=OFF'
,
'-DENABLE_CAT=OFF'
,
'-DENABLE_LIBXML2=OFF'
]).
dependency
(
'archive_static'
)
if
host_machine
.
system
()
==
'darwin'
depminizip
=
dependency
(
'minizip'
,
version
:
'>= 3.0.0'
)
else
deplibarchive
=
dependency
(
'libarchive'
,
version
:
'>= 3.4.0'
,
required
:
false
)
if
not
deplibarchive
.
found
()
deplibarchive
=
modcmake
.
subproject
(
'libarchive'
,
cmake_options
:
[
'-DCMAKE_BUILD_TYPE=Release'
,
'-DCMAKE_POSITION_INDEPENDENT_CODE=ON'
,
'-DENABLE_TEST=OFF'
,
'-DENABLE_TAR=OFF'
,
'-DENABLE_CPIO=OFF'
,
'-DENABLE_CAT=OFF'
,
'-DENABLE_LIBXML2=OFF'
]).
dependency
(
'archive_static'
)
endif
endif
depdl
=
meson
.
get_compiler
(
'cpp'
).
find_library
(
'dl'
,
required
:
false
)
else
...
...
This diff is collapsed.
Click to expand it.
src/meson.build
+
8
−
1
View file @
6bb307bd
...
...
@@ -39,6 +39,7 @@ libjami_sources = files(
'jamidht/server_account_manager.cpp'
,
'jamidht/sync_channel_handler.cpp'
,
'jamidht/sync_module.cpp'
,
'jamidht/transfer_channel_handler.cpp'
,
'media/audio/echo-cancel/null_echo_canceller.cpp'
,
'media/audio/sound/audiofile.cpp'
,
'media/audio/sound/dtmf.cpp'
,
...
...
@@ -130,6 +131,7 @@ libjami_dependencies = [
depthreads
,
depopendht
,
depgnutls
,
depnettle
,
deplibpjproject
,
deplibgit2
,
deplibsecp256k1
,
...
...
@@ -298,7 +300,12 @@ if conf.get('ENABLE_PLUGIN')
'plugin/pluginpreferencesutils.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
libjami
=
library
(
'jami'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment