Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
opendht
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Model registry
Analyze
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
opendht
Commits
2f1aef27
Commit
2f1aef27
authored
1 year ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
msgpack: support more package names
parent
76089d09
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+8
-2
8 additions, 2 deletions
CMakeLists.txt
with
8 additions
and
2 deletions
CMakeLists.txt
+
8
−
2
View file @
2f1aef27
...
...
@@ -61,7 +61,13 @@ if (NOT MSVC)
pkg_search_module
(
Nettle REQUIRED IMPORTED_TARGET nettle
)
check_include_file_cxx
(
msgpack.hpp HAVE_MSGPACKCXX
)
if
(
NOT HAVE_MSGPACKCXX
)
find_package
(
msgpack REQUIRED CONFIG NAMES msgpackc-cxx msgpack msgpack-cxx
)
find_package
(
msgpack QUIET CONFIG NAMES msgpack msgpackc-cxx
)
if
(
NOT msgpack_FOUND
)
find_package
(
msgpack REQUIRED CONFIG NAMES msgpack-cxx
)
set
(
MSGPACK_TARGET
"msgpack-cxx"
)
else
()
set
(
MSGPACK_TARGET
"msgpackc-cxx"
)
endif
()
endif
()
if
(
OPENDHT_TOOLS
)
find_package
(
Readline 6 REQUIRED
)
...
...
@@ -353,7 +359,7 @@ target_link_libraries(opendht
${
FMT_LIBRARY
}
)
if
(
NOT HAVE_MSGPACKCXX
)
target_link_libraries
(
opendht PUBLIC
msgpackc-cxx
)
target_link_libraries
(
opendht PUBLIC
MSGPACK_TARGET
)
endif
()
if
(
Jsoncpp_FOUND
)
target_link_libraries
(
opendht PUBLIC PkgConfig::Jsoncpp
)
...
...
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