Skip to content

Commit

Permalink
[buildmgr] Relax running CMake toolchain check
Browse files Browse the repository at this point in the history
  • Loading branch information
grasci-arm authored Feb 24, 2023
1 parent c939856 commit c6ddaf1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions tools/buildmgr/cbuildgen/config/CMSIS-Build-Utils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion tools/buildmgr/docs/doxygen/Build/src/General.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
</td>
<td>1.4.0</td>
Expand Down

0 comments on commit c6ddaf1

Please sign in to comment.