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
e9cfe4fe
Commit
e9cfe4fe
authored
4 years ago
by
Sébastien Blin
Committed by
Adrien Béraud
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
jsoncpp: fix minimal version detection
Change-Id: Ie27b1d9fe7d2b7ca3a3b8bba113bf334b724bc83
parent
14f6523a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/jsoncpp/rules.mak
+1
-1
1 addition, 1 deletion
contrib/src/jsoncpp/rules.mak
contrib/src/opendht/rules.mak
+1
-1
1 addition, 1 deletion
contrib/src/opendht/rules.mak
with
2 additions
and
2 deletions
contrib/src/jsoncpp/rules.mak
+
1
−
1
View file @
e9cfe4fe
...
...
@@ -4,7 +4,7 @@ JSONCPP_URL := https://github.com/open-source-parsers/jsoncpp/archive/$(JSONCPP_
PKGS
+=
jsoncpp
ifeq
($(call need_pkg,"jsoncpp >= 1.
6.5
"),)
ifeq
($(call need_pkg,"jsoncpp >= 1.
7.2
"),)
PKGS_FOUND
+=
jsoncpp
endif
...
...
This diff is collapsed.
Click to expand it.
contrib/src/opendht/rules.mak
+
1
−
1
View file @
e9cfe4fe
...
...
@@ -20,7 +20,7 @@ endif
ifneq
($(call need_pkg,"restinio >= v.0.5.1"),)
DEPS_opendht
+=
restinio
endif
ifneq
($(call need_pkg,"jsoncpp"),)
ifneq
($(call need_pkg,"jsoncpp
>= 1.7.2
"),)
DEPS_opendht
+=
jsoncpp
endif
ifneq
($(call need_pkg,"gnutls >= 3.3.0"),)
...
...
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