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/survey0/CMakeLists.txt | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'src/protocol/survey0') diff --git a/src/protocol/survey0/CMakeLists.txt b/src/protocol/survey0/CMakeLists.txt index 0a82463c..b6104a54 100644 --- a/src/protocol/survey0/CMakeLists.txt +++ b/src/protocol/survey0/CMakeLists.txt @@ -9,18 +9,32 @@ # # Surveyor/Respondent protocol +option (NNG_PROTO_RESPONDENT0 "Enable RESPONDENTv0 protocol." ON) +mark_as_advanced(NNG_PROTO_RESPONDENT0) + +option (NNG_PROTO_SURVEYOR0 "Enable SURVEYORv0 protocol." ON) +mark_as_advanced(NNG_PROTO_SURVEYOR0) + +set(_DEFS) +set(_HDRS) +set(_SRCS) if (NNG_PROTO_SURVEYOR0) - set(SURV0_SOURCES protocol/survey0/survey.c protocol/survey0/xsurvey.c - protocol/survey0/survey.h) - set(SURV0_HEADERS protocol/survey0/survey.h) + list(APPEND _DEFS -DNNG_HAVE_SURVEYOR0) + list(APPEND _SRCS + protocol/survey0/survey.c protocol/survey0/xsurvey.c + protocol/survey0/survey.h) + list(APPEND _HDRS protocol/survey0/survey.h) endif() if (NNG_PROTO_RESPONDENT0) - set(RESP0_SOURCES protocol/survey0/respond.c protocol/survey0/xrespond.c - protocol/survey0/respond.h) - set(RESP0_HEADERS protocol/survey0/respond.h) + list(APPEND _DEFS -DNNG_HAVE_RESPONDENT0) + list(APPEND _SRCS + protocol/survey0/respond.c protocol/survey0/xrespond.c + protocol/survey0/respond.h) + list(APPEND _HDRS protocol/survey0/respond.h) endif() -set(NNG_SOURCES ${NNG_SOURCES} ${SURV0_SOURCES} ${RESP0_SOURCES} PARENT_SCOPE) -set(NNG_HEADERS ${NNG_HEADERS} ${SURV0_HEADERS} ${RESP0_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