eclipse/wakaama
1
0
Fork 0
mirror of https://github.com/eclipse/wakaama.git synced 2025-05-08 23:31:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix CMake variables for data types

Browse Source 
The CMake cache variables had a typo. Moreover they weren't declared as
options. Therefore the correct defines were not set on the targets.
This commit is contained in:
Lukas Woodtli 2024-08-19 13:16:10 +02:00 committed by Lukas Woodtli
parent 76f42e24c3
commit 2175575bb0
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakePresets.json
View File

@ -62,6 +62,18 @@
"WAKAAMA_DATA_SENML_JSON": {
"type": "BOOL",
"value": "ON"
},
"WAKAAMA_DATA_JSON": {
"type": "BOOL",
"value": "OFF"
},
"WAKAAMA_DATA_SENML_CBOR": {
"type": "BOOL",
"value": "OFF"
},
"WAKAAMA_DATA_TLV": {
"type": "BOOL",
"value": "OFF"
}
}
},

20
wakaama.cmake
View File

@ -15,14 +15,14 @@ option(WAKAAMA_CLIENT_LWM2M_V_1_0 "Restrict the client code to use LwM2M version
# Data Types
set(WAKAAMA_DATA_TLV "Enable TLV payload support" ON)
set(WAKAAMA_DATA_JSON "Enable JSON payload support" ON)
set(WAKAAMA_DATA_SENML_JSON "Enable SenML JSON payload support" ON)
set(WAKAAMA_DATA_SENML_CBOR "Enable SenML CBOR payload support" ON)
option(WAKAAMA_DATA_TLV "Enable TLV payload support" ON)
option(WAKAAMA_DATA_JSON "Enable JSON payload support" ON)
option(WAKAAMA_DATA_SENML_JSON "Enable SenML JSON payload support" ON)
option(WAKAAMA_DATA_SENML_CBOR "Enable SenML CBOR payload support" ON)
set(WAKAAMA_DATA_SENML_CBOR_FLOAT16_SUPPORT "Enable 16-bit float support in CBOR" ON)
option(WAKAAMA_DATA_SENML_CBOR_FLOAT16_SUPPORT "Enable 16-bit float support in CBOR" ON)
set(WAKAAMA_DATA_OLD_CONTENT_FORMAT "Support the deprecated content format values for TLV and JSON" ON)
option(WAKAAMA_DATA_OLD_CONTENT_FORMAT "Support the deprecated content format values for TLV and JSON" ON)
# CoAP
option(WAKAAMA_COAP_RAW_BLOCK1_REQUESTS "Pass each unprocessed block 1 payload to the application" OFF)
@ -104,16 +104,16 @@ endfunction()
# Set defines regarding the different data types
function(set_data_format_defines target)
if(WAKAMA_DATA_TLV)
if(WAKAAMA_DATA_TLV)
target_compile_definitions(${target} PUBLIC LWM2M_SUPPORT_TLV)
endif()
if(WAKAMA_DATA_JSON)
if(WAKAAMA_DATA_JSON)
target_compile_definitions(${target} PUBLIC LWM2M_SUPPORT_JSON)
endif()
if(WAKAMA_DATA_SENML_JSON)
if(WAKAAMA_DATA_SENML_JSON)
target_compile_definitions(${target} PUBLIC LWM2M_SUPPORT_SENML_JSON)
endif()
if(WAKAMA_DATA_SENML_CBOR)
if(WAKAAMA_DATA_SENML_CBOR)
target_compile_definitions(${target} PUBLIC LWM2M_SUPPORT_SENML_CBOR)
endif()
if(NOT WAKAAMA_DATA_SENML_CBOR_FLOAT16_SUPPORT)