Merge pull request #105 from skliper/fix104-gen_hdr_file

Fix #104, Support generated config files
nasa · Jan 4, 2024 · 752a024 · 752a024
2 parents b678958 + 83943ce
commit 752a024
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/arch_build.cmake b/arch_build.cmake
@@ -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()
diff --git a/mission_build.cmake b/mission_build.cmake
@@ -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()