From ab995786f5fe9c850466adbeb0f4b94e087d3385 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 2 Jul 2020 15:59:58 -0400 Subject: [PATCH] HOTFIX: correct computation of OSAL_CONFIGURATION_FILE Now that TARGETSYSTEM is a list, it needs to do a foreach on each list component to work the same as it did before. --- cmake/arch_build.cmake | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/cmake/arch_build.cmake b/cmake/arch_build.cmake index 8cea4fc95..1ab843c5d 100644 --- a/cmake/arch_build.cmake +++ b/cmake/arch_build.cmake @@ -261,15 +261,12 @@ function(prepare) # Choose the configuration file to use for OSAL on this system set(OSAL_CONFIGURATION_FILE) - if (EXISTS "${MISSION_DEFS}/default_osconfig.cmake") - list(APPEND OSAL_CONFIGURATION_FILE "${MISSION_DEFS}/default_osconfig.cmake") - endif() - if (DEFINED OSAL_SYSTEM_OSCONFIG AND EXISTS "${MISSION_DEFS}/${OSAL_SYSTEM_OSCONFIG}_osconfig.cmake") - list(APPEND OSAL_CONFIGURATION_FILE "${MISSION_DEFS}/${OSAL_SYSTEM_OSCONFIG}_osconfig.cmake") - endif() - if (EXISTS "${MISSION_DEFS}/${TARGETSYSTEM}_osconfig.cmake") - list(APPEND OSAL_CONFIGURATION_FILE "${MISSION_DEFS}/${TARGETSYSTEM}_osconfig.cmake") - endif() + foreach(CONFIG ${BUILD_CONFIG_${TARGETSYSTEM}} ${OSAL_SYSTEM_OSCONFIG}) + if (EXISTS "${MISSION_DEFS}/${CONFIG}_osconfig.cmake") + list(APPEND OSAL_CONFIGURATION_FILE "${MISSION_DEFS}/${CONFIG}_osconfig.cmake") + endif() + endforeach() + list(REVERSE OSAL_CONFIGURATION_FILE) set(OSAL_CONFIGURATION_FILE ${OSAL_CONFIGURATION_FILE} PARENT_SCOPE) # Allow sources to "ifdef" certain things if running on simulated hardware