Skip to content

Commit b73feda

Browse files
committed
cmake: Enable all modes by default
Working on the project is easier, when all modes and most other features are enabled by default.
1 parent 9c66532 commit b73feda

File tree

8 files changed

+28
-11
lines changed

8 files changed

+28
-11
lines changed

CMakePresets.json

+12
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,18 @@
1212
"hidden": true,
1313
"binaryDir": "${sourceDir}/build-presets/${presetName}",
1414
"cacheVariables": {
15+
"WAKAAMA_MODE_SERVER": {
16+
"type": "BOOL",
17+
"value": "OFF"
18+
},
19+
"WAKAAMA_MODE_BOOTSTRAP_SERVER": {
20+
"type": "BOOL",
21+
"value": "OFF"
22+
},
23+
"WAKAAMA_MODE_CLIENT": {
24+
"type": "BOOL",
25+
"value": "OFF"
26+
},
1527
"WAKAAMA_PLATFORM": {
1628
"type": "STRING",
1729
"value": "POSIX"

examples/bootstrap_server/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.21)
33
project(bootstrap_server C)
44

55
set(WAKAAMA_MODE_BOOTSTRAP_SERVER ON)
6+
set(WAKAAMA_MODE_SERVER OFF)
7+
set(WAKAAMA_MODE_CLIENT OFF)
68
set(WAKAAMA_CLI ON)
79
set(WAKAAMA_TRANSPORT POSIX_UDP)
810
set(WAKAAMA_PLATFORM POSIX)

examples/client/raw_block1/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.21)
33
project(lwm2mclient_raw_block1 C)
44

55
set(WAKAAMA_MODE_CLIENT ON)
6+
set(WAKAAMA_MODE_SERVER OFF)
7+
set(WAKAAMA_MODE_BOOTSTRAP_SERVER OFF)
68
set(WAKAAMA_CLIENT_INITIATED_BOOTSTRAP ON)
79
set(WAKAAMA_DATA_SENML_JSON ON)
810
set(WAKAAMA_DATA_SENML_CBOR OFF)

examples/client/tinydtls/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.21)
33
project(lwm2mclient_tinydtls C)
44

55
set(WAKAAMA_MODE_CLIENT ON)
6+
set(WAKAAMA_MODE_SERVER OFF)
7+
set(WAKAAMA_MODE_BOOTSTRAP_SERVER OFF)
68
set(WAKAAMA_CLIENT_INITIATED_BOOTSTRAP ON)
79
set(WAKAAMA_DATA_SENML_JSON ON)
810
set(WAKAAMA_DATA_SENML_CBOR OFF)

examples/client/udp/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.21)
33
project(lwm2mclient C)
44

55
set(WAKAAMA_MODE_CLIENT ON)
6+
set(WAKAAMA_MODE_SERVER OFF)
7+
set(WAKAAMA_MODE_BOOTSTRAP_SERVER OFF)
68
set(WAKAAMA_CLIENT_INITIATED_BOOTSTRAP ON)
79
set(WAKAAMA_DATA_SENML_JSON ON)
810
set(WAKAAMA_DATA_SENML_CBOR OFF)

examples/lightclient/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.21)
33
project(lightclient C)
44

55
set(WAKAAMA_MODE_CLIENT ON)
6+
set(WAKAAMA_MODE_SERVER OFF)
7+
set(WAKAAMA_MODE_BOOTSTRAP_SERVER OFF)
8+
69
set(WAKAAMA_CLI ON)
710
set(WAKAAMA_TRANSPORT POSIX_UDP)
811
set(WAKAAMA_PLATFORM POSIX)

examples/server/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.21)
33
project(lwm2mserver C)
44

55
set(WAKAAMA_MODE_SERVER ON)
6+
set(WAKAAMA_MODE_CLIENT OFF)
7+
set(WAKAAMA_MODE_BOOTSTRAP_SERVER OFF)
68
set(WAKAAMA_CLI ON)
79
set(WAKAAMA_TRANSPORT POSIX_UDP)
810
set(WAKAAMA_PLATFORM POSIX)

wakaama.cmake

+3-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,9 @@ set(WAKAAMA_EXAMPLE_DIRECTORY "${WAKAAMA_TOP_LEVEL_DIRECTORY}/examples")
55
set(WAKAAMA_EXAMPLE_SHARED_DIRECTORY "${WAKAAMA_EXAMPLE_DIRECTORY}/shared")
66

77
# Mode
8-
option(WAKAAMA_MODE_SERVER "Enable LWM2M Server interfaces" OFF)
9-
option(WAKAAMA_MODE_BOOTSTRAP_SERVER "Enable LWM2M Bootstrap Server interfaces" OFF)
10-
option(WAKAAMA_MODE_CLIENT "Enable LWM2M Client interfaces" OFF)
11-
12-
if(NOT WAKAAMA_MODE_SERVER
13-
AND NOT WAKAAMA_MODE_BOOTSTRAP_SERVER
14-
AND NOT WAKAAMA_MODE_CLIENT
15-
)
16-
message(WARNING "No mode selected. Defaulting to 'WAKAAMA_MODE_SERVER'")
17-
set(WAKAAMA_MODE_SERVER ON)
18-
endif()
8+
option(WAKAAMA_MODE_SERVER "Enable LWM2M Server interfaces" ON)
9+
option(WAKAAMA_MODE_BOOTSTRAP_SERVER "Enable LWM2M Bootstrap Server interfaces" ON)
10+
option(WAKAAMA_MODE_CLIENT "Enable LWM2M Client interfaces" ON)
1911

2012
# Client
2113
option(WAKAAMA_CLIENT_INITIATED_BOOTSTRAP "Enable client initiated bootstrap support in a client" OFF)

0 commit comments

Comments
 (0)