From 440ddf86b3b3b6be47943c5b6408d63b091f2c28 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Wed, 25 Dec 2019 09:45:12 -0800 Subject: fixes #1040 Convert rest of the protocols to new CMake infra --- src/protocol/survey0/CMakeLists.txt | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'src/protocol/survey0') diff --git a/src/protocol/survey0/CMakeLists.txt b/src/protocol/survey0/CMakeLists.txt index 260c3e58..271afabf 100644 --- a/src/protocol/survey0/CMakeLists.txt +++ b/src/protocol/survey0/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2018 Staysail Systems, Inc. +# Copyright 2019 Staysail Systems, Inc. # Copyright 2018 Capitar IT Group BV # # This software is supplied under the terms of the MIT License, a @@ -15,24 +15,10 @@ mark_as_advanced(NNG_PROTO_RESPONDENT0) option (NNG_PROTO_SURVEYOR0 "Enable SURVEYORv0 protocol." ON) mark_as_advanced(NNG_PROTO_SURVEYOR0) -set(_DEFS) -set(_SRCS) +nng_sources_if(NNG_PROTO_SURVEYOR0 survey.c xsurvey.c) +nng_headers_if(NNG_PROTO_SURVEYOR0 nng/protocol/survey0/survey.h) +nng_defines_if(NNG_PROTO_SURVEYOR0 NNG_HAVE_SURVEYOR0) -if (NNG_PROTO_SURVEYOR0) - list(APPEND _DEFS -DNNG_HAVE_SURVEYOR0) - list(APPEND _SRCS - protocol/survey0/survey.c protocol/survey0/xsurvey.c - ${PROJECT_SOURCE_DIR}/include/nng/protocol/survey0/survey.h) - -endif() - -if (NNG_PROTO_RESPONDENT0) - list(APPEND _DEFS -DNNG_HAVE_RESPONDENT0) - list(APPEND _SRCS - protocol/survey0/respond.c protocol/survey0/xrespond.c - ${PROJECT_SOURCE_DIR}/include/nng/protocol/survey0/respond.h) - -endif() - -set(NNG_DEFS ${NNG_DEFS} ${_DEFS} PARENT_SCOPE) -set(NNG_SRCS ${NNG_SRCS} ${_SRCS} PARENT_SCOPE) +nng_sources_if(NNG_PROTO_RESPONDENT0 respond.c xrespond.c) +nng_headers_if(NNG_PROTO_RESPONDENT0 nng/protocol/survey0/respond.h) +nng_defines_if(NNG_PROTO_RESPONDENT0 NNG_HAVE_RESPONDENT0) \ No newline at end of file -- cgit v1.2.3-70-g09d2