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
aceb548c
Commit
aceb548c
authored
5 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
cmake: make peer discovery build optional
parent
afce4639
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.github/workflows/ccpp.yml
+1
-1
1 addition, 1 deletion
.github/workflows/ccpp.yml
CMakeLists.txt
+13
-2
13 additions, 2 deletions
CMakeLists.txt
tests/compile_http.sh
+0
-1
0 additions, 1 deletion
tests/compile_http.sh
with
14 additions
and
4 deletions
.github/workflows/ccpp.yml
+
1
−
1
View file @
aceb548c
...
...
@@ -20,7 +20,7 @@ jobs:
run
:
|
cd argon2 && make && sudo make install && cd ..
-
name
:
configure
run
:
./configure
run
:
./configure
--enable-proxy-client --enable-proxy-server --enable-push-notifications
-
name
:
make
run
:
make
-
name
:
make check
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
13
−
2
View file @
aceb548c
...
...
@@ -22,6 +22,7 @@ option (OPENDHT_PROXY_SERVER_IDENTITY "Allow clients to use the node identity" O
option
(
OPENDHT_PROXY_CLIENT
"Enable DHT proxy client, use Restinio and jsoncpp"
OFF
)
option
(
OPENDHT_PROXY_OPENSSL
"Build DHT proxy with OpenSSL"
ON
)
option
(
OPENDHT_PROXY_HTTP_PARSER_FORK
"Build DHT proxy with custom http_parser to support old API"
OFF
)
option
(
OPENDHT_PEER_DISCOVERY
"Enable multicast peer discovery"
ON
)
option
(
OPENDHT_INDEX
"Build DHT indexation feature"
OFF
)
option
(
OPENDHT_TESTS
"Add unit tests executable"
OFF
)
option
(
OPENDHT_C
"Build C bindings"
OFF
)
...
...
@@ -177,7 +178,6 @@ list (APPEND opendht_SOURCES
src/securedht.cpp
src/dhtrunner.cpp
src/log.cpp
src/peer_discovery.cpp
src/network_utils.cpp
src/thread_pool.cpp
)
...
...
@@ -203,12 +203,17 @@ list (APPEND opendht_HEADERS
include/opendht/securedht.h
include/opendht/log.h
include/opendht/log_enable.h
include/opendht/peer_discovery.h
include/opendht/thread_pool.h
include/opendht/network_utils.h
include/opendht.h
)
if
(
OPENDHT_PEER_DISCOVERY
)
list
(
APPEND opendht_SOURCES src/peer_discovery.cpp
)
list
(
APPEND opendht_HEADERS include/opendht/peer_discovery.h
)
add_definitions
(
-DOPENDHT_PEERDISCOVERY
)
endif
()
if
(
OPENDHT_PYTHON
)
message
(
"Indexation enabled since it is required for Python support"
)
set
(
OPENDHT_INDEX ON
)
...
...
@@ -392,6 +397,12 @@ if (OPENDHT_TESTS)
tests/dhtproxytester.cpp
)
endif
()
if
(
OPENDHT_PEER_DISCOVERY
)
list
(
APPEND test_FILES
tests/peerdiscoverytester.h
tests/peerdiscoverytester.cpp
)
endif
()
add_executable
(
opendht_unit_tests
tests/tests_runner.cpp
${
test_FILES
}
...
...
This diff is collapsed.
Click to expand it.
tests/compile_http.sh
deleted
100755 → 0
+
0
−
1
View file @
afce4639
g++
-Wall
-Wextra
-Wfatal-errors
-pedantic
-g
../src/http.cpp tests_runner.cpp httptester.cpp
-o
run.out
-lopendht
-lpthread
-lcppunit
-ljsoncpp
-DOPENDHT_JSONCPP
-I
../include/opendht
-DASIO_STANDALONE
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