From ce4a5ec7d16581ed0def9e161db09ce75c5b2184 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 16 Jul 2021 11:23:42 +0200 Subject: [PATCH] update preproject config --- CMakeLists.txt | 9 ++------- cmake/PreProjectConfig.cmake | 3 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cfc6c16..a04a81d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,8 @@ set(STM32_ADD_NETWORKING_CODE OFF) set(FSFW_HAL_ADD_STM32H7 ON) # This call has to come before the project call -set(CMAKE_TOOLCHAIN_FILE ${STM32_CMAKE_PATH}/cmake/stm32_gcc.cmake) +include("${CMAKE_SCRIPT_PATH}/PreProjectConfig.cmake") + # Project Name project(fsfw-example-stm32h7-rtems ASM C CXX) @@ -134,12 +135,6 @@ target_compile_options(${TARGET_NAME} PRIVATE ${WARNING_FLAGS} ) -if(TGT_BSP) - set(TARGET_STRING "Target BSP: ${TGT_BSP}") -else() - set(TARGET_STRING "Target BSP: Hosted") -endif() - string(CONCAT POST_BUILD_COMMENT "Build directory: ${CMAKE_BINARY_DIR}\n" "Target OSAL: ${FSFW_OSAL}\n" diff --git a/cmake/PreProjectConfig.cmake b/cmake/PreProjectConfig.cmake index ec577e3..4c833d5 100644 --- a/cmake/PreProjectConfig.cmake +++ b/cmake/PreProjectConfig.cmake @@ -42,3 +42,6 @@ set(CMAKE_TOOLCHAIN_FILE ${RTEMS_CONFIG_DIR}/RTEMSToolchain.cmake PARENT_SCOPE ) + +set(RTEMS_BSP ${RTEMS_BSP} CACHE STRING "RTEMS BSP") +set(RTEMS_PREFIX ${RTEMS_PREFIX} CACHE STRING "RTEMS Prefix")