aboutsummaryrefslogtreecommitdiff
path: root/src/protocol/pipeline0
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-02-21 19:17:30 -0800
committerGarrett D'Amore <garrett@damore.org>2018-02-21 19:17:30 -0800
commit3a0ca04110778a56bcd523fbaba2439a61738e03 (patch)
treead55a99a5ef948e335f4a631949876b5d92cd09a /src/protocol/pipeline0
parenta4d378030df61760ea4daa2ddbe46b1366f8e977 (diff)
downloadnng-3a0ca04110778a56bcd523fbaba2439a61738e03.tar.gz
nng-3a0ca04110778a56bcd523fbaba2439a61738e03.tar.bz2
nng-3a0ca04110778a56bcd523fbaba2439a61738e03.zip
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.
Diffstat (limited to 'src/protocol/pipeline0')
-rw-r--r--src/protocol/pipeline0/CMakeLists.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/protocol/pipeline0/CMakeLists.txt b/src/protocol/pipeline0/CMakeLists.txt
index 6153c5a7..669fb9dc 100644
--- a/src/protocol/pipeline0/CMakeLists.txt
+++ b/src/protocol/pipeline0/CMakeLists.txt
@@ -1,6 +1,6 @@
#
-# Copyright 2017 Garrett D'Amore <garrett@damore.org>
-# Copyright 2017 Capitar IT Group BV <info@capitar.com>
+# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech>
+# Copyright 2018 Capitar IT Group BV <info@capitar.com>
#
# 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_PUSH0)
set(PUSH0_SOURCES protocol/pipeline0/push.c protocol/pipeline0/push.h)
- install(FILES push.h DESTINATION include/nng/protocol/pipeline0)
+ set(PUSH0_HEADERS protocol/pipeline0/push.h)
endif()
if (NNG_PROTO_PULL0)
set(PULL0_SOURCES protocol/pipeline0/pull.c protocol/pipeline0/pull.h)
- install(FILES pull.h DESTINATION include/nng/protocol/pipeline0)
+ set(PULL0_HEADERS protocol/pipeline0/pull.h)
endif()
-set(NNG_SOURCES ${NNG_SOURCES} ${PUSH0_SOURCES} ${PULL0_SOURCES} PARENT_SCOPE) \ No newline at end of file
+set(NNG_SOURCES ${NNG_SOURCES} ${PUSH0_SOURCES} ${PULL0_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${PUSH0_HEADERS} ${PULL0_HEADERS} PARENT_SCOPE)