nasa/fprime
1
0
Fork 0
mirror of https://github.com/nasa/fprime.git synced 2025-12-15 14:05:24 -06:00
Code Issues Packages Projects Releases 34 Wiki Activity

Designate base config from non-base config (#3787)

Browse Source
This commit is contained in:
M Starch 2025-06-24 11:08:33 -07:00 committed by GitHub
parent 5723115f5e
commit 1e0ea6cb20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/API.cmake
View File

@ -443,7 +443,7 @@ function(fprime_add_config_build_target)
# 2. Configuration processing must be called in-between # 2. Configuration processing must be called in-between
#### ####
fprime__process_module_setup("Library" fprime__process_module_setup("Library"
"CONFIGURATION_OVERRIDES;STATIC;INTERFACE;CHOOSES_IMPLEMENTATIONS" ${ARGN_PASS}) "CONFIGURATION_OVERRIDES;STATIC;INTERFACE;CHOOSES_IMPLEMENTATIONS;BASE_CONFIG" ${ARGN_PASS})
fprime__internal_process_configuration_sources( fprime__internal_process_configuration_sources(
"${INTERNAL_MODULE_NAME}" "${INTERNAL_MODULE_NAME}"
"${INTERNAL_SOURCES}" "${INTERNAL_SOURCES}"
@ -460,7 +460,9 @@ function(fprime_add_config_build_target)
# The new module should include the root configuration directory # The new module should include the root configuration directory
fprime_target_include_directories("${INTERNAL_MODULE_NAME}" PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/..") fprime_target_include_directories("${INTERNAL_MODULE_NAME}" PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/..")
# The configuration target should depend on the new module # The configuration target should depend on the new module
target_link_libraries("${FPRIME__INTERNAL_CONFIG_TARGET_NAME}" INTERFACE "${INTERNAL_MODULE_NAME}") if (INTERNAL_BASE_CONFIG)
target_link_libraries("${FPRIME__INTERNAL_CONFIG_TARGET_NAME}" INTERFACE "${INTERNAL_MODULE_NAME}")
endif()
# Set up the new module to be marked as FPRIME_CONFIGURATION # Set up the new module to be marked as FPRIME_CONFIGURATION
append_list_property("${INTERNAL_MODULE_NAME}" GLOBAL PROPERTY "FPRIME_CONFIG_MODULES") append_list_property("${INTERNAL_MODULE_NAME}" GLOBAL PROPERTY "FPRIME_CONFIG_MODULES")
set_property(TARGET "${INTERNAL_MODULE_NAME}" PROPERTY FPRIME_CONFIGURATION TRUE) set_property(TARGET "${INTERNAL_MODULE_NAME}" PROPERTY FPRIME_CONFIGURATION TRUE)

6
cmake/config_assembler.cmake
View File

@ -1,7 +1,13 @@
####
# config_assembler.cmake:
#
# CMake configuration handling function.
####
include_guard() include_guard()
# Create a target to act as an interface to all fprime configuration modules # Create a target to act as an interface to all fprime configuration modules
set(FPRIME__INTERNAL_CONFIG_TARGET_NAME "__fprime_config") set(FPRIME__INTERNAL_CONFIG_TARGET_NAME "__fprime_config")
add_library(${FPRIME__INTERNAL_CONFIG_TARGET_NAME} INTERFACE) add_library(${FPRIME__INTERNAL_CONFIG_TARGET_NAME} INTERFACE)
#### ####
# Function `fprime__internal_process_configuration_sources`: # Function `fprime__internal_process_configuration_sources`:
# #

1
cmake/platform/Darwin.cmake
View File

@ -21,5 +21,6 @@ register_fprime_config(
CHOOSES_IMPLEMENTATIONS CHOOSES_IMPLEMENTATIONS
Os_Cpu_Darwin Os_Cpu_Darwin
Os_Memory_Darwin Os_Memory_Darwin
BASE_CONFIG
) )
target_compile_definitions(PlatformDarwin INTERFACE -DTGT_OS_TYPE_DARWIN) target_compile_definitions(PlatformDarwin INTERFACE -DTGT_OS_TYPE_DARWIN)

11
cmake/platform/Linux.cmake
View File

@ -14,10 +14,11 @@ endif()
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/unix/Platform/") add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/unix/Platform/")
# Override unix implementations with LINUX specific ones # Override unix implementations with LINUX specific ones
register_fprime_config( register_fprime_config(
PlatformLinux PlatformLinux
INTERFACE # No buildable files generated INTERFACE # No buildable files generated
CHOOSES_IMPLEMENTATIONS CHOOSES_IMPLEMENTATIONS
Os_Cpu_Linux Os_Cpu_Linux
Os_Memory_Linux Os_Memory_Linux
BASE_CONFIG
) )
target_compile_definitions(PlatformLinux INTERFACE -DTGT_OS_TYPE_LINUX) target_compile_definitions(PlatformLinux INTERFACE -DTGT_OS_TYPE_LINUX)

1
cmake/platform/unix/Platform/CMakeLists.txt
View File

@ -21,4 +21,5 @@ register_fprime_config(
Os_Cpu_Stub Os_Cpu_Stub
Os_Memory_Stub Os_Memory_Stub
INTERFACE # No compilable outputs produced INTERFACE # No compilable outputs produced
BASE_CONFIG
) )

3
default/config/CMakeLists.txt
View File

@ -29,5 +29,6 @@ register_fprime_config(
"${CMAKE_CURRENT_LIST_DIR}/StaticMemoryConfig.hpp" "${CMAKE_CURRENT_LIST_DIR}/StaticMemoryConfig.hpp"
"${CMAKE_CURRENT_LIST_DIR}/TlmChanImplCfg.hpp" "${CMAKE_CURRENT_LIST_DIR}/TlmChanImplCfg.hpp"
"${CMAKE_CURRENT_LIST_DIR}/TlmPacketizerCfg.hpp" "${CMAKE_CURRENT_LIST_DIR}/TlmPacketizerCfg.hpp"
"${CMAKE_CURRENT_LIST_DIR}/CRCCheckerConfig.hpp" "${CMAKE_CURRENT_LIST_DIR}/CRCCheckerConfig.hpp"
BASE_CONFIG
) )