From 77984b14a65c0a7387c97f3d36f947dd17358744 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 5 Nov 2018 13:54:40 -0800 Subject: fixes #577 target library dependencies should be public This is a significant refactor of the library configuration. We use the modern package configuration helper, with a template script that also does the find_package dance for any of our dependencies. We also have restructured the code so that most protocols and transports have their configuration isolated to their own CMakeLists file, reducing the size of the global CMakeLists file. --- src/protocol/pubsub0/CMakeLists.txt | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'src/protocol/pubsub0') diff --git a/src/protocol/pubsub0/CMakeLists.txt b/src/protocol/pubsub0/CMakeLists.txt index 49ec8913..29f64049 100644 --- a/src/protocol/pubsub0/CMakeLists.txt +++ b/src/protocol/pubsub0/CMakeLists.txt @@ -9,16 +9,28 @@ # # Pub/Sub protocol +option (NNG_PROTO_PUB0 "Enable PUBv0 protocol." ON) +mark_as_advanced(NNG_PROTO_PUB0) + +option (NNG_PROTO_SUB0 "Enable SUBv0 protocol." ON) +mark_as_advanced(NNG_PROTO_SUB0) + +set(_DEFS) +set(_SRCS) +set(_HDRS) if (NNG_PROTO_PUB0) - set(PUB0_SOURCES protocol/pubsub0/pub.c protocol/pubsub0/pub.h) - set(PUB0_HEADERS protocol/pubsub0/pub.h) + list(APPEND _DEFS -DNNG_HAVE_PUB0) + list(APPEND _SRCS protocol/pubsub0/pub.c protocol/pubsub0/pub.h) + list(APPEND _HDRS protocol/pubsub0/pub.h) endif() if (NNG_PROTO_SUB0) - set(SUB0_SOURCES protocol/pubsub0/sub.c protocol/pubsub0/sub.h) - set(SUB0_HEADERS protocol/pubsub0/sub.h) + list(APPEND _DEFS -DNNG_HAVE_SUB0) + list(APPEND _SRCS protocol/pubsub0/sub.c protocol/pubsub0/sub.h) + list(APPEND _HDRS protocol/pubsub0/sub.h) endif() -set(NNG_SOURCES ${NNG_SOURCES} ${PUB0_SOURCES} ${SUB0_SOURCES} PARENT_SCOPE) -set(NNG_HEADERS ${NNG_HEADERS} ${PUB0_HEADERS} ${SUB0_HEADERS} PARENT_SCOPE) +set(NNG_DEFS ${NNG_DEFS} ${_DEFS} PARENT_SCOPE) +set(NNG_SRCS ${NNG_SRCS} ${_SRCS} PARENT_SCOPE) +set(NNG_HDRS ${NNG_HDRS} ${_HDRS} PARENT_SCOPE) -- cgit v1.2.3-70-g09d2