Skip to content

Commit d7073fa

Browse files
committed
HOTFIX IC 2021-05-19, table build with app name mismatch
For a table build where the app name passed to cfe_add_tables does not match the actual app name, it must use the APP_DYNAMIC_TARGET_LIST and APP_STATIC_TARGET_LIST variables to get the target list for installation.
1 parent ae1dc3b commit d7073fa

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

cmake/arch_build.cmake

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,18 @@ function(add_cfe_tables APP_NAME TBL_SRC_FILES)
150150

151151
if (TGTNAME)
152152
set (TABLE_TGTLIST ${TGTNAME})
153-
else()
153+
elseif (TARGET ${APP_NAME})
154154
set (TABLE_TGTLIST ${TGTLIST_${APP_NAME}})
155-
endif()
156-
157-
# The first parameter should match the name of an app that was
158-
# previously defined using "add_cfe_app". If target-scope properties
159-
# are used for include directories and compile definitions, this is needed
160-
# to compile tables with the same include path/definitions as the app has.
161-
# However historically this could have been any string, which still works
162-
# if directory-scope properties are used for includes, so this is not
163-
# an error.
164-
if (NOT TARGET ${APP_NAME})
155+
else()
156+
# The first parameter should match the name of an app that was
157+
# previously defined using "add_cfe_app". If target-scope properties
158+
# are used for include directories and compile definitions, this is needed
159+
# to compile tables with the same include path/definitions as the app has.
160+
# However historically this could have been any string, which still works
161+
# if directory-scope properties are used for includes, so this is not
162+
# an error.
165163
message("NOTE: \"${APP_NAME}\" passed to add_cfe_tables is not a previously-defined application target")
164+
set (TABLE_TGTLIST ${APP_STATIC_TARGET_LIST} ${APP_DYNAMIC_TARGET_LIST})
166165
endif()
167166

168167
# The table source must be compiled using the same "include_directories"

0 commit comments

Comments
 (0)