aboutsummaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2020-11-16 20:44:29 -0800
committerGarrett D'Amore <garrett@damore.org>2020-11-18 21:05:16 -0800
commitb826bfc171d90f8bde7bd672c0ac14201b8b2742 (patch)
tree5c416487f24104e6305a797af31c5e8b1aab99d1 /src/CMakeLists.txt
parentcda4885676f009e2e7f2ad5e6c52743efc8b8924 (diff)
downloadnng-b826bfc171d90f8bde7bd672c0ac14201b8b2742.tar.gz
nng-b826bfc171d90f8bde7bd672c0ac14201b8b2742.tar.bz2
nng-b826bfc171d90f8bde7bd672c0ac14201b8b2742.zip
Work for test refactoring.
There are a few major areas in this change. * CMake options are now located in a common cmake/NNGOptions.cmake file. This should make it easier for folks to figure out what the options are, and how they are used. * Tests are now scoped with their directory name, which should avoid possible name collisions with test names. * A number of tests have been either moved or incorporated into the newer testutil/acutest framework. We are moving away from my old c-convey framework to something easier to debug. * We use CMake directories a bit more extensively leading to a much cleaner CMake structure. It's not complete, but a big step in the right direction, and a preview of future work. * Tests are now run with verbose flags, so we get more test results in the CI/CD logs.
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 57e6596c..5e0170a3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,30 +11,16 @@
nng_sources(nng.c nng_legacy.c)
nng_headers(nng/nng.h)
-
target_include_directories(nng PRIVATE ${PROJECT_SOURCE_DIR}/src)
target_include_directories(nng_testing PRIVATE ${PROJECT_SOURCE_DIR}/src)
add_subdirectory(core)
-add_subdirectory(platform/windows)
-add_subdirectory(platform/posix)
+add_subdirectory(platform)
add_subdirectory(compat/nanomsg)
-add_subdirectory(protocol/bus0)
-add_subdirectory(protocol/pair0)
-add_subdirectory(protocol/pair1)
-add_subdirectory(protocol/pipeline0)
-add_subdirectory(protocol/pubsub0)
-add_subdirectory(protocol/reqrep0)
-add_subdirectory(protocol/survey0)
-
-add_subdirectory(transport/inproc)
-add_subdirectory(transport/ipc)
-add_subdirectory(transport/tcp)
-add_subdirectory(transport/tls)
-add_subdirectory(transport/ws)
-add_subdirectory(transport/zerotier)
+add_subdirectory(protocol)
+add_subdirectory(transport)
add_subdirectory(supplemental/base64)
add_subdirectory(supplemental/http)