aboutsummaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2017-10-31 13:06:38 -0700
committerGarrett D'Amore <garrett@damore.org>2017-11-02 16:10:26 -0700
commit7bf591e20a94b8d926f92ab9b320f3b75d342345 (patch)
treed67ce7cab328a004346419047feede7d579dad77 /src/CMakeLists.txt
parentd340af7dc250388f48d36c5078c4857c51bb6121 (diff)
downloadnng-7bf591e20a94b8d926f92ab9b320f3b75d342345.tar.gz
nng-7bf591e20a94b8d926f92ab9b320f3b75d342345.tar.bz2
nng-7bf591e20a94b8d926f92ab9b320f3b75d342345.zip
fixes #143 Protocols and transports should be "configurable"
This makes all the protocols and transports optional. All of them except ZeroTier are enabled by default, but you can now disable them (remove from the build) with cmake options. The test suite is modified so that tests still run as much as they can, but skip over things caused by missing functionality from the library (due to configuration). Further, the constant definitions and prototypes for functions that are specific to transports or protocols are moved into appropriate headers, which should be included directly by applications wishing to use these. We have also added and improved documentation -- all of the transports are documented, and several more man pages for protocols have been added. (Req/Rep and Surveyor are still missing.)
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt49
1 files changed, 17 insertions, 32 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5a49052..4901789b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -74,30 +74,6 @@ set (NNG_SOURCES
core/timer.h
core/transport.c
core/transport.h
-
- protocol/bus/bus.c
-
- protocol/pair/pair_v0.c
- protocol/pair/pair_v1.c
-
- protocol/pipeline/pull.c
- protocol/pipeline/push.c
-
- protocol/pubsub/pub.c
- protocol/pubsub/sub.c
-
- protocol/reqrep/rep.c
- protocol/reqrep/req.c
-
- protocol/survey/respond.c
- protocol/survey/survey.c
-
- transport/inproc/inproc.c
-
- transport/ipc/ipc.c
-
- transport/tcp/tcp.c
-
)
if (NNG_PLATFORM_POSIX)
@@ -146,14 +122,19 @@ endif()
install(FILES transport/inproc/inproc.h
DESTINATION include/nng/transport/inproc)
-if (NNG_ENABLE_ZEROTIER)
- set (NNG_SOURCES ${NNG_SOURCES}
- transport/zerotier/zerotier.c
- transport/zerotier/zerotier.h
- )
- install(FILES transport/zerotier/zerotier.h
- DESTINATION include/nng/transport/zerotier)
-endif()
+
+add_subdirectory(protocol/bus0)
+add_subdirectory(protocol/pair0)
+add_subdirectory(protocol/pair1)
+add_subdirectory(protocol/pipeline0)
+add_subdirectory(protocol/pubsub0)
+add_subdirectory(protocol/reqrep0)
+add_subdirectory(protocol/survey0)
+
+add_subdirectory(transport/inproc)
+add_subdirectory(transport/ipc)
+add_subdirectory(transport/tcp)
+add_subdirectory(transport/zerotier)
include_directories(AFTER SYSTEM ${PROJECT_SOURCE_DIR}/src
${NNG_REQUIRED_INCLUDES})
@@ -216,3 +197,7 @@ install (TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
+
+# Promote settings to parent
+set(NNG_REQUIRED_LIBRARIES ${NNG_REQUIRED_LIBRARIES} PARENT_SCOPE)
+set(NNG_REQUIRED_LFLAGS ${NNG_REQUIRED_LFLAGS} PARENT_SCOPE) \ No newline at end of file