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.

7 files changed, 34 insertions, 27 deletions

diff --git a/src/protocol/bus0/CMakeLists.txt b/src/protocol/bus0/CMakeLists.txt
index 5071054a..06c44111 100644
--- a/src/protocol/bus0/CMakeLists.txt
+++ b/src/protocol/bus0/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,7 +12,8 @@
 
 if (NNG_PROTO_BUS0)
     set(BUS0_SOURCES protocol/bus0/bus.c protocol/bus0/bus.h)
-    install(FILES bus.h DESTINATION include/nng/protocol/bus0)
+    set(BUS0_HEADERS protocol/bus0/bus.h)
 endif()
 
 set(NNG_SOURCES ${NNG_SOURCES} ${BUS0_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${BUS0_HEADERS} PARENT_SCOPE)
diff --git a/src/protocol/pair0/CMakeLists.txt b/src/protocol/pair0/CMakeLists.txt
index 68e7ad34..2ba8d374 100644
--- a/src/protocol/pair0/CMakeLists.txt
+++ b/src/protocol/pair0/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,7 +12,8 @@
 
 if (NNG_PROTO_PAIR0)
     set(PAIR0_SOURCES protocol/pair0/pair.c protocol/pair0/pair.h)
-    install(FILES pair.h DESTINATION include/nng/protocol/pair0)
+    set(PAIR0_HEADERS protocol/pair0/pair.h)
 endif()
 
 set(NNG_SOURCES ${NNG_SOURCES} ${PAIR0_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${PAIR0_HEADERS} PARENT_SCOPE)
diff --git a/src/protocol/pair1/CMakeLists.txt b/src/protocol/pair1/CMakeLists.txt
index f35d6959..9c0ca09f 100644
--- a/src/protocol/pair1/CMakeLists.txt
+++ b/src/protocol/pair1/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@staystail.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,7 +12,8 @@
 
 if (NNG_PROTO_PAIR1)
     set(PAIR1_SOURCES protocol/pair1/pair.c protocol/pair1/pair.h)
-    install(FILES pair.h DESTINATION include/nng/protocol/pair1)
+    set(PAIR1_HEADERS protocol/pair1/pair.h)
 endif()
 
 set(NNG_SOURCES ${NNG_SOURCES} ${PAIR1_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${PAIR1_HEADERS} PARENT_SCOPE)
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)
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 <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_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)
diff --git a/src/protocol/reqrep0/CMakeLists.txt b/src/protocol/reqrep0/CMakeLists.txt
index 4e82ad41..7b04aa2d 100644
--- a/src/protocol/reqrep0/CMakeLists.txt
+++ b/src/protocol/reqrep0/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_REQ0)
     set(REQ0_SOURCES protocol/reqrep0/req.c protocol/reqrep0/req.h)
-    install(FILES req.h DESTINATION include/nng/protocol/reqrep0)
+    set(REQ0_HEADERS protocol/reqrep0/req.h)
 endif()
 
 if (NNG_PROTO_REP0)
     set(REP0_SOURCES protocol/reqrep0/rep.c protocol/reqrep0/rep.h)
-    install(FILES rep.h DESTINATION include/nng/protocol/reqrep0)
+    set(REP0_HEADERS protocol/reqrep0/rep.h)
 endif()
 
-set(NNG_SOURCES ${NNG_SOURCES} ${REQ0_SOURCES} ${REP0_SOURCES} PARENT_SCOPE)
\ No newline at end of file
+set(NNG_SOURCES ${NNG_SOURCES} ${REQ0_SOURCES} ${REP0_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${REQ0_HEADERS} ${REP0_HEADERS} PARENT_SCOPE)
diff --git a/src/protocol/survey0/CMakeLists.txt b/src/protocol/survey0/CMakeLists.txt
index 61e5aa7b..479c031c 100644
--- a/src/protocol/survey0/CMakeLists.txt
+++ b/src/protocol/survey0/CMakeLists.txt
@@ -12,12 +12,13 @@
 
 if (NNG_PROTO_SURVEYOR0)
     set(SURV0_SOURCES protocol/survey0/survey.c protocol/survey0/survey.h)
-    install(FILES survey.h DESTINATION include/nng/protocol/survey0)
+    set(SURV0_HEADERS protocol/survey0/survey.h)
 endif()
 
 if (NNG_PROTO_RESPONDENT0)
     set(RESP0_SOURCES protocol/survey0/respond.c protocol/survey0/respond.h)
-    install(FILES respond.h DESTINATION include/nng/protocol/survey0)
+    set(RESP0_HEADERS protocol/survey0/respond.h)
 endif()
 
-set(NNG_SOURCES ${NNG_SOURCES} ${SURV0_SOURCES} ${RESP0_SOURCES} PARENT_SCOPE)
\ No newline at end of file
+set(NNG_SOURCES ${NNG_SOURCES} ${SURV0_SOURCES} ${RESP0_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${SURV0_HEADERS} ${RESP0_HEADERS} PARENT_SCOPE)