From 3a0ca04110778a56bcd523fbaba2439a61738e03 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Wed, 21 Feb 2018 19:17:30 -0800 Subject: CMake & CPack improvements. These are incremental updates... we avoid using install() in the subdirectories, so that we can adapt properly to them in the single parent directory. We have started some of the work to improve support for CPack. This is still not yet done, but work in progress. --- src/protocol/pubsub0/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/protocol/pubsub0') diff --git a/src/protocol/pubsub0/CMakeLists.txt b/src/protocol/pubsub0/CMakeLists.txt index 4edcbfae..49ec8913 100644 --- a/src/protocol/pubsub0/CMakeLists.txt +++ b/src/protocol/pubsub0/CMakeLists.txt @@ -1,6 +1,6 @@ # -# Copyright 2017 Garrett D'Amore -# Copyright 2017 Capitar IT Group BV +# Copyright 2018 Staysail Systems, Inc. +# Copyright 2018 Capitar IT Group BV # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -12,12 +12,13 @@ if (NNG_PROTO_PUB0) set(PUB0_SOURCES protocol/pubsub0/pub.c protocol/pubsub0/pub.h) - install(FILES pub.h DESTINATION include/nng/protocol/pubsub0) + set(PUB0_HEADERS protocol/pubsub0/pub.h) endif() if (NNG_PROTO_SUB0) set(SUB0_SOURCES protocol/pubsub0/sub.c protocol/pubsub0/sub.h) - install(FILES sub.h DESTINATION include/nng/protocol/pubsub0) + set(SUB0_HEADERS protocol/pubsub0/sub.h) endif() -set(NNG_SOURCES ${NNG_SOURCES} ${PUB0_SOURCES} ${SUB0_SOURCES} PARENT_SCOPE) \ No newline at end of file +set(NNG_SOURCES ${NNG_SOURCES} ${PUB0_SOURCES} ${SUB0_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${PUB0_HEADERS} ${SUB0_HEADERS} PARENT_SCOPE) -- cgit v1.2.3-70-g09d2