Skip to content

Commit

Permalink
HOTFIX IC 2021-05-19, table build with app name mismatch
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jphickey committed May 24, 2021
1 parent ae1dc3b commit d7073fa
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions cmake/arch_build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,18 @@ function(add_cfe_tables APP_NAME TBL_SRC_FILES)

if (TGTNAME)
set (TABLE_TGTLIST ${TGTNAME})
else()
elseif (TARGET ${APP_NAME})
set (TABLE_TGTLIST ${TGTLIST_${APP_NAME}})
endif()

# The first parameter should match the name of an app that was
# previously defined using "add_cfe_app". If target-scope properties
# are used for include directories and compile definitions, this is needed
# to compile tables with the same include path/definitions as the app has.
# However historically this could have been any string, which still works
# if directory-scope properties are used for includes, so this is not
# an error.
if (NOT TARGET ${APP_NAME})
else()
# The first parameter should match the name of an app that was
# previously defined using "add_cfe_app". If target-scope properties
# are used for include directories and compile definitions, this is needed
# to compile tables with the same include path/definitions as the app has.
# However historically this could have been any string, which still works
# if directory-scope properties are used for includes, so this is not
# an error.
message("NOTE: \"${APP_NAME}\" passed to add_cfe_tables is not a previously-defined application target")
set (TABLE_TGTLIST ${APP_STATIC_TARGET_LIST} ${APP_DYNAMIC_TARGET_LIST})
endif()

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

0 comments on commit d7073fa

Please sign in to comment.