From d6bb25e1e0a25cb5aa781ac4f90b513fd5624f50 Mon Sep 17 00:00:00 2001 From: Gregor Burger Date: Tue, 20 Nov 2018 11:48:03 +0100 Subject: move all public headers to include/nng/ folder This change makes embedding nng + nggpp (or other projects depending on nng) in cmake easier. The header files are moved to a separate include directory. This also makes installation of the headers easier, and allows clearer identification of private vs public heade files. Some additional cleanups were performed by @gedamore, but the main credit for this change belongs with @gregorburger. --- src/supplemental/tls/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/supplemental/tls/CMakeLists.txt') diff --git a/src/supplemental/tls/CMakeLists.txt b/src/supplemental/tls/CMakeLists.txt index 111ff70f..8fed1df1 100644 --- a/src/supplemental/tls/CMakeLists.txt +++ b/src/supplemental/tls/CMakeLists.txt @@ -13,8 +13,7 @@ if (NNG_SUPP_TLS) set(_DEFS -DNNG_SUPP_TLS) endif() -set(_SRCS supplemental/tls/tls.h) -set(_HDRS supplemental/tls/tls.h) +set(_SRCS ${PROJECT_SOURCE_DIR}/include/nng/supplemental/tls/tls.h) # For now we only support the ARM mbedTLS library. if (NNG_SUPP_TLS_MBEDTLS) @@ -36,12 +35,10 @@ endif() list(APPEND NNG_DEFS ${_DEFS}) list(APPEND NNG_SRCS ${_SRCS}) -list(APPEND NNG_HDRS ${_HDRS}) list(APPEND NNG_LIBS ${_LIBS}) list(APPEND NNG_INCS ${_INCS}) set(NNG_DEFS ${NNG_DEFS} PARENT_SCOPE) set(NNG_SRCS ${NNG_SRCS} PARENT_SCOPE) -set(NNG_HDRS ${NNG_HDRS} PARENT_SCOPE) set(NNG_LIBS ${NNG_LIBS} PARENT_SCOPE) set(NNG_INCS ${NNG_INCS} PARENT_SCOPE) -- cgit v1.2.3-70-g09d2