Skip to content

Commit baa6b4a

Browse files
AnastaZIukPrzemog1
authored andcommitted
Resolved conflicts, cherry-picked e312993
1 parent 639e2d4 commit baa6b4a

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

cmake/common.cmake

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,18 +1427,15 @@ namespace @IMPL_NAMESPACE@ {
14271427
]=])
14281428
unset(RETVAL_EVAL)
14291429
list(LENGTH CAP_NAMES CAP_COUNT)
1430-
if(CAP_COUNT GREATER 0)
1431-
math(EXPR LAST_CAP "${CAP_COUNT} - 1")
1432-
foreach(i RANGE ${LAST_CAP})
1433-
list(GET CAP_NAMES ${i} CAP)
1434-
list(GET CAP_KINDS ${i} KIND)
1435-
string(CONFIGURE [=[
1430+
math(EXPR CAP_COUNT "${CAP_COUNT} - 1")
1431+
foreach(i RANGE ${CAP_COUNT})
1432+
list(GET CAP_NAMES ${i} CAP)
1433+
list(GET CAP_KINDS ${i} KIND)
1434+
string(CONFIGURE [=[
14361435
retval += ".@CAP@_" + std::to_string(@KIND@.@CAP@);
1437-
]=] RETVALUE_VIEW @ONLY)
1438-
string(APPEND RETVAL_EVAL "${RETVALUE_VIEW}")
1439-
endforeach()
1440-
endif()
1441-
1436+
]=] RETVALUE_VIEW @ONLY)
1437+
string(APPEND RETVAL_EVAL "${RETVALUE_VIEW}")
1438+
endforeach()
14421439
string(CONFIGURE "${HEADER_ITEM_VIEW}" HEADER_ITEM_EVAL @ONLY)
14431440
set_property(TARGET ${IMPL_TARGET} APPEND_STRING PROPERTY NBL_HEADER_CONTENT "${HEADER_ITEM_EVAL}")
14441441

0 commit comments

Comments
 (0)