diff options
| author | Garrett D'Amore <garrett@damore.org> | 2019-12-25 09:45:12 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2019-12-25 09:58:05 -0800 |
| commit | 440ddf86b3b3b6be47943c5b6408d63b091f2c28 (patch) | |
| tree | 1dc5a7ed1d8da3e6540f5c8b1f7c75df0a718496 /src/supplemental | |
| parent | 1b71d116b8343d0d67bdb8c303cfecc2773fd0aa (diff) | |
| download | nng-440ddf86b3b3b6be47943c5b6408d63b091f2c28.tar.gz nng-440ddf86b3b3b6be47943c5b6408d63b091f2c28.tar.bz2 nng-440ddf86b3b3b6be47943c5b6408d63b091f2c28.zip | |
fixes #1040 Convert rest of the protocols to new CMake infra
Diffstat (limited to 'src/supplemental')
| -rw-r--r-- | src/supplemental/tcp/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/supplemental/util/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/supplemental/websocket/CMakeLists.txt | 9 |
3 files changed, 7 insertions, 18 deletions
diff --git a/src/supplemental/tcp/CMakeLists.txt b/src/supplemental/tcp/CMakeLists.txt index 09f917f8..d6b3b531 100644 --- a/src/supplemental/tcp/CMakeLists.txt +++ b/src/supplemental/tcp/CMakeLists.txt @@ -1,5 +1,4 @@ # -# Copyright 2018 Capitar IT Group BV <info@capitar.com> # Copyright 2019 Staysail Systems, Inc. <info@staysail.tech> # # This software is supplied under the terms of the MIT License, a @@ -8,6 +7,4 @@ # found online at https://opensource.org/licenses/MIT. # -set(_SRCS supplemental/tcp/tcp.c) - -set(NNG_SRCS ${NNG_SRCS} ${_SRCS} PARENT_SCOPE) +nng_sources(tcp.c)
\ No newline at end of file diff --git a/src/supplemental/util/CMakeLists.txt b/src/supplemental/util/CMakeLists.txt index 64374d69..5a144da9 100644 --- a/src/supplemental/util/CMakeLists.txt +++ b/src/supplemental/util/CMakeLists.txt @@ -1,6 +1,5 @@ # -# Copyright 2018 Capitar IT Group BV <info@capitar.com> -# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# Copyright 2019 Staysail Systems, Inc. <info@staysail.tech> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -8,9 +7,5 @@ # found online at https://opensource.org/licenses/MIT. # -set(_SRCS supplemental/util/options.c - ${PROJECT_SOURCE_DIR}/include/nng/supplemental/util/options.h - supplemental/util/platform.c - ${PROJECT_SOURCE_DIR}/include/nng/supplemental/util/platform.h) - -set(NNG_SRCS ${NNG_SRCS} ${_SRCS} PARENT_SCOPE) +nng_sources(options.c platform.c) +nng_headers(nng/supplemental/util/options.h nng/supplemental/util/platform.h) diff --git a/src/supplemental/websocket/CMakeLists.txt b/src/supplemental/websocket/CMakeLists.txt index 913544dd..74438cd5 100644 --- a/src/supplemental/websocket/CMakeLists.txt +++ b/src/supplemental/websocket/CMakeLists.txt @@ -1,6 +1,6 @@ # +# Copyright 2019 Staysail Systems, Inc. <info@staysail.tech> # Copyright 2017 Capitar IT Group BV <info@capitar.com> -# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> # # This software is supplied under the terms of the MIT License, a # copy of which should be located in the distribution where this @@ -9,10 +9,7 @@ # if (NNG_SUPP_WEBSOCKET) - set(_SRCS - supplemental/websocket/websocket.c - supplemental/websocket/websocket.h) + nng_sources(websocket.c websocket.h) else() - set(_SRCS supplemental/websocket/stub.c) + nng_sources(stub.c) endif() -set(NNG_SRCS ${NNG_SRCS} ${_SRCS} PARENT_SCOPE) |