Skip to content

Commit 8b2305c

Browse files
committed
cmake: Client examples as individual projects
The client example projects now use Wakaama as a direct dependency. They have also been split into three different projects (udp, tinydtls and raw_block1). The CI and integration tests were adjusted for the new project.
1 parent 7b51734 commit 8b2305c

23 files changed

+2055
-2917
lines changed

.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
strategy:
4040
matrix:
41-
example: ["bootstrap_server", "client", "lightclient", "server"]
41+
example: ["bootstrap_server", "client/udp", "client/tinydtls", "client/raw_block1", "lightclient", "server"]
4242

4343
steps:
4444
- name: Checkout code including full history and submodules

.github/workflows/build_and_test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Build examples for integration tests
4343
run: |
44-
for example in "server" "bootstrap_server"
44+
for example in "server" "bootstrap_server" "client/udp"
4545
do
4646
echo "Building example ${example}"
4747
tools/ci/run_ci.sh \

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ Options:
198198

199199
### Test client example
200200

201-
* ``cmake -S examples/client -B build-client -DWAKAAMA_MODE_CLIENT=ON``
202-
* ``cmake --build build-client``
201+
* ``cmake -S examples/client/udp -B build-client-udp``
202+
* ``cmake --build build-client-udp``
203203
* ``./build-client/lwm2mclient [Options]``
204204

205-
Next to lwm2mclient a DTLS enabled variant named lwm2mclient_tinydtls gets built.
205+
Next to lwm2mclient there are also examples with DTLS enabled and with raw block1 transfer enabled.
206206

207207
The lwm2mclient features nine LWM2M objects:
208208
- Security Object (id: 0)

examples/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@ cmake_minimum_required(VERSION 3.21)
22

33
# Our examples are designed for POSIX systems
44
add_compile_definitions(_POSIX_C_SOURCE=200809)
5-
6-
add_subdirectory(client)

examples/client/CMakeLists.txt

-51
This file was deleted.

0 commit comments

Comments
 (0)