From 12cd9916ca95f364a41a236aeefff1ee41dbc3ae Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 15 Jul 2021 01:28:25 +0200 Subject: [PATCH] script corrections --- CMakeLists.txt | 4 ++-- cmake/scripts/cmake_build_config.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b365b841..6fa14d19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,8 +75,8 @@ include (${CMAKE_SCRIPT_PATH}/HardwareOsPreConfig.cmake) pre_source_hw_os_config() if(TGT_BSP) - if(${TGT_BSP} MATCHES "arm/q7s" OR ${TGT_BSP} MATCHES "arm/raspberrypi" - OR ${TGT_BSP} MATCHES "arm/beagleboneblack" + if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/raspberrypi" + OR TGT_BSP MATCHES "arm/beagleboneblack" ) set(FSFW_CONFIG_PATH "linux/fsfwconfig") if(NOT Q7S_SIMPLE_MODE) diff --git a/cmake/scripts/cmake_build_config.py b/cmake/scripts/cmake_build_config.py index 67f175d9..e3259fd4 100755 --- a/cmake/scripts/cmake_build_config.py +++ b/cmake/scripts/cmake_build_config.py @@ -98,7 +98,7 @@ def main(): print(f"Navigating into build directory: {build_path}") os.chdir(build_folder) - cmake_command = f"cmake {generator_cmake_arg} -DOS_FSFW=\"{osal}\" " \ + cmake_command = f"cmake {generator_cmake_arg} -DFSFW_OSAL=\"{osal}\" " \ f"-DCMAKE_BUILD_TYPE=\"{cmake_build_type}\" {cmake_target_cfg_cmd} " \ f"{define_string} {source_location}" # Remove redundant spaces