Skip to content

Commit 9381491

Browse files
committed
a few minor updates to NBL_CREATE_NSC_COMPILE_RULES to skip optional arguments in json payload, CI should pass now
1 parent bd6cc4d commit 9381491

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

cmake/common.cmake

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,17 +1277,22 @@ namespace @IMPL_NAMESPACE@ {
12771277
foreach(INDEX RANGE ${LAST_INDEX})
12781278
string(JSON INPUT GET "${IMPL_INPUTS}" ${INDEX} INPUT)
12791279
string(JSON BASE_KEY GET "${IMPL_INPUTS}" ${INDEX} KEY)
1280-
string(JSON COMPILE_OPTIONS_LENGTH LENGTH "${IMPL_INPUTS}" ${INDEX} COMPILE_OPTIONS)
1281-
1280+
12821281
set(COMPILE_OPTIONS "")
1283-
math(EXPR LAST_CO "${COMPILE_OPTIONS_LENGTH} - 1")
1284-
foreach(COMP_IDX RANGE 0 ${LAST_CO})
1285-
string(JSON COMP_ITEM GET "${IMPL_INPUTS}" ${INDEX} COMPILE_OPTIONS ${COMP_IDX})
1286-
list(APPEND COMPILE_OPTIONS "${COMP_ITEM}")
1287-
endforeach()
1282+
string(JSON HAS_COMPILE_OPTIONS ERROR_VARIABLE ERROR_VAR TYPE "${IMPL_INPUTS}" ${INDEX} COMPILE_OPTIONS)
1283+
if(HAS_COMPILE_OPTIONS STREQUAL "ARRAY")
1284+
string(JSON COMPILE_OPTIONS_LENGTH LENGTH "${IMPL_INPUTS}" ${INDEX} COMPILE_OPTIONS)
1285+
if(NOT COMPILE_OPTIONS_LENGTH EQUAL 0)
1286+
math(EXPR LAST_CO "${COMPILE_OPTIONS_LENGTH} - 1")
1287+
foreach(COMP_IDX RANGE 0 ${LAST_CO})
1288+
string(JSON COMP_ITEM GET "${IMPL_INPUTS}" ${INDEX} COMPILE_OPTIONS ${COMP_IDX})
1289+
list(APPEND COMPILE_OPTIONS "${COMP_ITEM}")
1290+
endforeach()
1291+
endif()
1292+
endif()
12881293

12891294
set(DEPENDS_ON "")
1290-
string(JSON HAS_DEPENDS TYPE "${IMPL_INPUTS}" ${INDEX} DEPENDS)
1295+
string(JSON HAS_DEPENDS ERROR_VARIABLE ERROR_VAR TYPE "${IMPL_INPUTS}" ${INDEX} DEPENDS)
12911296
if(HAS_DEPENDS STREQUAL "ARRAY")
12921297
string(JSON DEPENDS_LENGTH LENGTH "${IMPL_INPUTS}" ${INDEX} DEPENDS)
12931298
if(NOT DEPENDS_LENGTH EQUAL 0)
@@ -1305,7 +1310,7 @@ namespace @IMPL_NAMESPACE@ {
13051310

13061311
set(HAS_CAPS FALSE)
13071312
set(CAPS_LENGTH 0)
1308-
string(JSON CAPS_TYPE TYPE "${IMPL_INPUTS}" ${INDEX} CAPS)
1313+
string(JSON CAPS_TYPE ERROR_VARIABLE ERROR_VAR TYPE "${IMPL_INPUTS}" ${INDEX} CAPS)
13091314
if(CAPS_TYPE STREQUAL "ARRAY")
13101315
string(JSON CAPS_LENGTH LENGTH "${IMPL_INPUTS}" ${INDEX} CAPS)
13111316
if(NOT CAPS_LENGTH EQUAL 0)

examples_tests

0 commit comments

Comments
 (0)