Skip to content
GitLab
Explore
Sign in
Register
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
5f1e7952
Commit
5f1e7952
authored
2 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
Revert "more attempts to find msgpackc-cxx in a universal way"
This reverts commit
965fbb43
.
parent
41eabc72
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+2
-7
2 additions, 7 deletions
CMakeLists.txt
with
2 additions
and
7 deletions
CMakeLists.txt
+
2
−
7
View file @
5f1e7952
...
@@ -59,10 +59,7 @@ if (NOT MSVC)
...
@@ -59,10 +59,7 @@ if (NOT MSVC)
find_package
(
PkgConfig REQUIRED
)
find_package
(
PkgConfig REQUIRED
)
pkg_search_module
(
GnuTLS REQUIRED IMPORTED_TARGET gnutls
)
pkg_search_module
(
GnuTLS REQUIRED IMPORTED_TARGET gnutls
)
pkg_search_module
(
Nettle REQUIRED IMPORTED_TARGET nettle
)
pkg_search_module
(
Nettle REQUIRED IMPORTED_TARGET nettle
)
check_include_file_cxx
(
msgpack.hpp HAVE_MSGPACKCXX
)
find_package
(
msgpack REQUIRED NAMES msgpackc-cxx msgpack msgpack-cxx
)
if
(
NOT HAVE_MSGPACKCXX
)
find_package
(
msgpack REQUIRED CONFIG
)
endif
()
if
(
OPENDHT_TOOLS
)
if
(
OPENDHT_TOOLS
)
find_package
(
Readline 6 REQUIRED
)
find_package
(
Readline 6 REQUIRED
)
endif
()
endif
()
...
@@ -350,11 +347,9 @@ target_link_libraries(opendht
...
@@ -350,11 +347,9 @@ target_link_libraries(opendht
PUBLIC
PUBLIC
${
CMAKE_THREAD_LIBS_INIT
}
${
CMAKE_THREAD_LIBS_INIT
}
PkgConfig::GnuTLS
PkgConfig::GnuTLS
msgpackc-cxx
${
FMT_LIBRARY
}
${
FMT_LIBRARY
}
)
)
if
(
NOT HAVE_MSGPACKCXX
)
target_link_libraries
(
opendht PUBLIC msgpackc-cxx
)
endif
()
if
(
Jsoncpp_FOUND
)
if
(
Jsoncpp_FOUND
)
target_link_libraries
(
opendht PUBLIC PkgConfig::Jsoncpp
)
target_link_libraries
(
opendht PUBLIC PkgConfig::Jsoncpp
)
endif
()
endif
()
...
...
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