From c6ddaf18e1ff985725395cf65f6fb5dcd9ae039f Mon Sep 17 00:00:00 2001 From: grasci <86058054+grasci-arm@users.noreply.github.com> Date: Fri, 24 Feb 2023 08:25:10 +0000 Subject: [PATCH] [buildmgr] Relax running CMake toolchain check --- tools/buildmgr/cbuildgen/config/CMSIS-Build-Utils.cmake | 4 ++-- tools/buildmgr/docs/doxygen/Build/src/General.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/buildmgr/cbuildgen/config/CMSIS-Build-Utils.cmake b/tools/buildmgr/cbuildgen/config/CMSIS-Build-Utils.cmake index bfcbccae3..11e13b25a 100644 --- a/tools/buildmgr/cbuildgen/config/CMSIS-Build-Utils.cmake +++ b/tools/buildmgr/cbuildgen/config/CMSIS-Build-Utils.cmake @@ -13,11 +13,11 @@ function(cbuild_get_running_toolchain root version lang) endif() endif() if(CMAKE_COMPILER_VERSION VERSION_LESS TOOLCHAIN_VERSION_MIN) - message(FATAL_ERROR "Running toolchain version ${CMAKE_COMPILER_VERSION} is less than minimum required ${TOOLCHAIN_VERSION_MIN}") + message(WARNING "Running toolchain version ${CMAKE_COMPILER_VERSION} is less than minimum required ${TOOLCHAIN_VERSION_MIN}") endif() if(DEFINED TOOLCHAIN_VERSION_MAX) if(CMAKE_COMPILER_VERSION VERSION_GREATER TOOLCHAIN_VERSION_MAX) - message(FATAL_ERROR "Running toolchain version ${CMAKE_COMPILER_VERSION} is greater than maximum required ${TOOLCHAIN_VERSION_MAX}") + message(WARNING "Running toolchain version ${CMAKE_COMPILER_VERSION} is greater than maximum required ${TOOLCHAIN_VERSION_MAX}") endif() endif() set(CMAKE_COMPILER_ROOT ${CMAKE_${lang}_COMPILER}) diff --git a/tools/buildmgr/docs/doxygen/Build/src/General.txt b/tools/buildmgr/docs/doxygen/Build/src/General.txt index d2adefaa0..8eb6c4dc3 100644 --- a/tools/buildmgr/docs/doxygen/Build/src/General.txt +++ b/tools/buildmgr/docs/doxygen/Build/src/General.txt @@ -66,7 +66,7 @@ Software layers and Virtual I/O simplify these use cases: - added 'output' filenames customization handling - added 'gendir' component instance attribute - rework toolchain registration - - fixex: include paths order + - fixed: include paths order - fixed: file specific defines 1.4.0