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.

6 files changed, 24 insertions, 20 deletions

diff --git a/src/transport/inproc/CMakeLists.txt b/src/transport/inproc/CMakeLists.txt
index a445da85..7c016bce 100644
--- a/src/transport/inproc/CMakeLists.txt
+++ b/src/transport/inproc/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_TRANSPORT_INPROC)
     set(INPROC_SOURCES transport/inproc/inproc.c transport/inproc/inproc.h)
-    install(FILES inproc.h DESTINATION include/nng/transport/inproc)
+    set(INPROC_HEADERS transport/inproc/inproc.h)
 endif()
 
 set(NNG_SOURCES ${NNG_SOURCES} ${INPROC_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${INPROC_HEADERS} PARENT_SCOPE)
diff --git a/src/transport/ipc/CMakeLists.txt b/src/transport/ipc/CMakeLists.txt
index 1a5496cf..fbae69ef 100644
--- a/src/transport/ipc/CMakeLists.txt
+++ b/src/transport/ipc/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_TRANSPORT_IPC)
     set(IPC_SOURCES transport/ipc/ipc.c transport/ipc/ipc.h)
-    install(FILES ipc.h DESTINATION include/nng/transport/ipc)
+    set(IPC_HEADERS transport/ipc/ipc.h)
 endif()
 
 set(NNG_SOURCES ${NNG_SOURCES} ${IPC_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${IPC_HEADERS} PARENT_SCOPE)
diff --git a/src/transport/tcp/CMakeLists.txt b/src/transport/tcp/CMakeLists.txt
index 305c357a..27b62e10 100644
--- a/src/transport/tcp/CMakeLists.txt
+++ b/src/transport/tcp/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_TRANSPORT_TCP)
     set(TCP_SOURCES transport/tcp/tcp.c transport/tcp/tcp.h)
-    install(FILES tcp.h DESTINATION include/nng/transport/tcp)
+    set(TCP_HEADERS transport/tcp/tcp.h)
 endif()
 
 set(NNG_SOURCES ${NNG_SOURCES} ${TCP_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${TCP_HEADERS} PARENT_SCOPE)
diff --git a/src/transport/tls/CMakeLists.txt b/src/transport/tls/CMakeLists.txt
index 59ff3f5e..d55a9e92 100644
--- a/src/transport/tls/CMakeLists.txt
+++ b/src/transport/tls/CMakeLists.txt
@@ -1,6 +1,6 @@
 #
-# Copyright 2017 Staysail Systems, Inc. <info@staysail.tech>
-# 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,8 +12,8 @@
 
 if (NNG_TRANSPORT_TLS)
     set(TLS_SOURCES transport/tls/tls.c transport/tls/tls.h)
-    install(FILES tls.h DESTINATION include/nng/transport/tls)
-    
+    set(TLS_HEADERS transport/tls/tls.h)
 endif()
 
 set(NNG_SOURCES ${NNG_SOURCES} ${TLS_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${TLS_HEADERS} PARENT_SCOPE)
diff --git a/src/transport/ws/CMakeLists.txt b/src/transport/ws/CMakeLists.txt
index 18842df9..71e2aefa 100644
--- a/src/transport/ws/CMakeLists.txt
+++ b/src/transport/ws/CMakeLists.txt
@@ -1,6 +1,6 @@
 #
-# Copyright 2017 Staysail Systems, Inc. <info@staysail.tech>
-# 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,8 +12,8 @@
 
 if (NNG_TRANSPORT_WS)
     set(WS_SOURCES transport/ws/websocket.c transport/ws/websocket.h)
-    install(FILES websocket.h DESTINATION include/nng/transport/ws)
-    
+    set(WS_HEADERS transport/ws/websocket.h)
 endif()
 
 set(NNG_SOURCES ${NNG_SOURCES} ${WS_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${WS_HEADERS} PARENT_SCOPE)
diff --git a/src/transport/zerotier/CMakeLists.txt b/src/transport/zerotier/CMakeLists.txt
index a4271eb7..8ca78f0f 100644
--- a/src/transport/zerotier/CMakeLists.txt
+++ b/src/transport/zerotier/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
@@ -45,7 +45,8 @@ if (NNG_TRANSPORT_ZEROTIER)
     message(STATUS "Found ZeroTier at ${NNG_LIBZTCORE}")
 
     set(ZT_SOURCES transport/zerotier/zerotier.c transport/zerotier/zerotier.h)
-    install(FILES zerotier.h DESTINATION include/nng/transport/zerotier)
+    set(ZT_HEADERS transport/zerotier/zerotier.h)
 endif()
 
 set(NNG_SOURCES ${NNG_SOURCES} ${ZT_SOURCES} PARENT_SCOPE)
+set(NNG_HEADERS ${NNG_HEADERS} ${ZT_HEADERS} PARENT_SCOPE)