Skip to content

Commit 5a1177b

Browse files
tejlmandmbolivar-nordic
authored andcommitted
[nrf fromtree] Revert "cmake: manual handling of CMakeCheckCompilerFlag.cmake inclusion"
With the change to cmake_minimum_required(VERSION 3.20.0) then this commit is no longer needed. This reverts commit 6ca2bf2. Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 8c31f31)
1 parent e40ff0a commit 5a1177b

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

cmake/app/boilerplate.cmake

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,6 @@ set(__build_dir ${CMAKE_CURRENT_BINARY_DIR}/zephyr)
7878

7979
set(PROJECT_BINARY_DIR ${__build_dir})
8080

81-
if(${CMAKE_VERSION} VERSION_EQUAL 3.19.0 OR
82-
${CMAKE_VERSION} VERSION_EQUAL 3.19.1)
83-
message(WARNING "CMake 3.19.0/3.19.1 contains a bug regarding Toolchain/compiler "
84-
"testing. Consider switching to a different CMake version.\n"
85-
"See more here: \n"
86-
"- https://github.com/zephyrproject-rtos/zephyr/issues/30232\n"
87-
"- https://gitlab.kitware.com/cmake/cmake/-/issues/21497")
88-
# This is a workaround for #30232.
89-
# During Zephyr CMake invocation a plain C compiler is used for DTS.
90-
# This results in the internal `CheckCompilerFlag.cmake` being included by CMake
91-
# Later, when the full toolchain is configured, then `CMakeCheckCompilerFlag.cmake` is included.
92-
# This overloads the `cmake_check_compiler_flag()` function, thus causing #30232.
93-
# By manualy loading `CMakeCheckCompilerFlag.cmake` then `CheckCompilerFlag.cmake` will overload
94-
# the functions (and thus win the battle), and because `include_guard(GLOBAL)` is used in
95-
# `CMakeCheckCompilerFlag.cmake` this file will not be re-included later.
96-
include(${CMAKE_ROOT}/Modules/Internal/CMakeCheckCompilerFlag.cmake)
97-
endif()
98-
9981
message(STATUS "Application: ${APPLICATION_SOURCE_DIR}")
10082

10183
add_custom_target(code_data_relocation_target)

0 commit comments

Comments
 (0)