Skip to content

Commit

Permalink
Fix #104, Support generated config files
Browse files Browse the repository at this point in the history
  • Loading branch information
skliper committed Dec 19, 2023
1 parent b678958 commit 83943ce
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions arch_build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ set(LC_PLATFORM_CONFIG_FILE_LIST
foreach(LC_CFGFILE ${LC_PLATFORM_CONFIG_FILE_LIST})
get_filename_component(CFGKEY "${LC_CFGFILE}" NAME_WE)
if (DEFINED LC_CFGFILE_SRC_${CFGKEY})
set(DEFAULT_SOURCE "${LC_CFGFILE_SRC_${CFGKEY}}")
set(DEFAULT_SOURCE GENERATED_FILE "${LC_CFGFILE_SRC_${CFGKEY}}")
else()
set(DEFAULT_SOURCE "${CMAKE_CURRENT_LIST_DIR}/config/default_${LC_CFGFILE}")
set(DEFAULT_SOURCE FALLBACK_FILE "${CMAKE_CURRENT_LIST_DIR}/config/default_${LC_CFGFILE}")
endif()

generate_config_includefile(
FILE_NAME "${LC_CFGFILE}"
FALLBACK_FILE "${DEFAULT_SOURCE}"
${DEFAULT_SOURCE}
)
endforeach()
6 changes: 3 additions & 3 deletions mission_build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ endif(CFE_EDS_ENABLED_BUILD)
foreach(LC_CFGFILE ${LC_MISSION_CONFIG_FILE_LIST})
get_filename_component(CFGKEY "${LC_CFGFILE}" NAME_WE)
if (DEFINED LC_CFGFILE_SRC_${CFGKEY})
set(DEFAULT_SOURCE "${LC_CFGFILE_SRC_${CFGKEY}}")
set(DEFAULT_SOURCE GENERATED_FILE "${LC_CFGFILE_SRC_${CFGKEY}}")
else()
set(DEFAULT_SOURCE "${CMAKE_CURRENT_LIST_DIR}/config/default_${LC_CFGFILE}")
set(DEFAULT_SOURCE FALLBACK_FILE "${CMAKE_CURRENT_LIST_DIR}/config/default_${LC_CFGFILE}")
endif()

generate_config_includefile(
FILE_NAME "${LC_CFGFILE}"
FALLBACK_FILE "${DEFAULT_SOURCE}"
${DEFAULT_SOURCE}
)
endforeach()

0 comments on commit 83943ce

Please sign in to comment.