zephyrproject-rtos · carlescufi · Aug 20, 2021 · Aug 19, 2021 · Aug 12, 2021 · Aug 10, 2021
diff --git a/boards/arm/mps2_an521/empty_cpu0/CMakeLists.txt b/boards/arm/mps2_an521/empty_cpu0/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(empty_cpu0)

diff --git a/cmake/app/boilerplate.cmake b/cmake/app/boilerplate.cmake
@@ -26,7 +26,7 @@
 #
 # Under these restraints we use a second 'cmake_minimum_required'
 # invocation in every toplevel CMakeLists.txt.
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 # CMP0002: "Logical target names must be globally unique"
 cmake_policy(SET CMP0002 NEW)
@@ -78,24 +78,6 @@ set(__build_dir ${CMAKE_CURRENT_BINARY_DIR}/zephyr)
 
 set(PROJECT_BINARY_DIR ${__build_dir})
 
-if(${CMAKE_VERSION} VERSION_EQUAL 3.19.0 OR
-   ${CMAKE_VERSION} VERSION_EQUAL 3.19.1)
-  message(WARNING "CMake 3.19.0/3.19.1 contains a bug regarding Toolchain/compiler "
-          "testing. Consider switching to a different CMake version.\n"
-          "See more here: \n"
-          "- https://github.com/zephyrproject-rtos/zephyr/issues/30232\n"
-          "- https://gitlab.kitware.com/cmake/cmake/-/issues/21497")
-  # This is a workaround for #30232.
-  # During Zephyr CMake invocation a plain C compiler is used for DTS.
-  # This results in the internal `CheckCompilerFlag.cmake` being included by CMake
-  # Later, when the full toolchain is configured, then `CMakeCheckCompilerFlag.cmake` is included.
-  # This overloads the `cmake_check_compiler_flag()` function, thus causing #30232.
-  # By manualy loading `CMakeCheckCompilerFlag.cmake` then `CheckCompilerFlag.cmake` will overload
-  # the functions (and thus win the battle), and because `include_guard(GLOBAL)` is used in
-  # `CMakeCheckCompilerFlag.cmake` this file will not be re-included later.
-  include(${CMAKE_ROOT}/Modules/Internal/CMakeCheckCompilerFlag.cmake)
-endif()
-
 message(STATUS "Application: ${APPLICATION_SOURCE_DIR}")
 
 add_custom_target(code_data_relocation_target)

diff --git a/cmake/boards.cmake b/cmake/boards.cmake
@@ -27,7 +27,7 @@ if(CMAKE_SCRIPT_MODE_FILE AND NOT CMAKE_PARENT_LIST_FILE)
 # BOARD_ROOT: Semi-colon separated board roots
 # FILE_OUT: Set to a file path to save the boards to a file. If not defined the
 #           the contents will be printed to stdout
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 set(NO_BOILERPLATE TRUE)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 project(Zephyr-Kernel-Doc LANGUAGES)
 
 set(NO_BOILERPLATE TRUE)

diff --git a/doc/getting_started/index.rst b/doc/getting_started/index.rst
@@ -62,7 +62,7 @@ The current minimum required version for the main dependencies are:
      - Min. Version
 
    * - `CMake <https://cmake.org/>`_
-     - 3.13.1
+     - 3.20.0
 
    * - `Python <https://www.python.org/>`_
      - 3.6
@@ -76,6 +76,16 @@ The current minimum required version for the main dependencies are:
 
       .. _install_dependencies_ubuntu:
 
+      #. Download, inspect and execute the Kitware archive script to add the
+         Kitware APT repository to your sources list.
+         A detailed explanation of ``kitware-archive.sh`` can be found here
+         `kitware third-party apt repository <https://apt.kitware.com/>`_::
+
+         .. code-block:: bash
+
+            wget https://apt.kitware.com/kitware-archive.sh
+            sudo bash kitware-archive.sh
+
       #. Use ``apt`` to install the required dependencies:
 
          .. code-block:: bash

diff --git a/doc/getting_started/installation_linux.rst b/doc/getting_started/installation_linux.rst
@@ -139,24 +139,24 @@ there are several ways of obtaining a more recent one:
   .. code-block:: console
 
      cd ~
-     wget https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-Linux-x86_64.sh
-     chmod +x cmake-3.15.3-Linux-x86_64.sh
-     sudo ./cmake-3.15.3-Linux-x86_64.sh --skip-license --prefix=/usr/local
+     wget https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-Linux-x86_64.sh
+     chmod +x cmake-3.21.1-Linux-x86_64.sh
+     sudo ./cmake-3.21.1-Linux-x86_64.sh --skip-license --prefix=/usr/local
      hash -r
 
   The ``hash -r`` command may be necessary if the installation script
   put cmake into a new location on your PATH.
 
 * Download and install from the pre-built binaries provided by the CMake
   project itself in the `CMake Downloads`_ page.
-  For example, to install version 3.13.1 in :file:`~/bin/cmake`:
+  For example, to install version 3.21.1 in :file:`~/bin/cmake`:
 
   .. code-block:: console
 
      mkdir $HOME/bin/cmake && cd $HOME/bin/cmake
-     wget https://github.com/Kitware/CMake/releases/download/v3.13.1/cmake-3.13.1-Linux-x86_64.sh
-     yes | sh cmake-3.13.1-Linux-x86_64.sh | cat
-     echo "export PATH=$PWD/cmake-3.13.1-Linux-x86_64/bin:\$PATH" >> $HOME/.zephyrrc
+     wget https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-Linux-x86_64.sh
+     yes | sh cmake-3.21.1-Linux-x86_64.sh | cat
+     echo "export PATH=$PWD/cmake-3.21.1-Linux-x86_64/bin:\$PATH" >> $HOME/.zephyrrc
 
 * Use ``pip3``:
 

diff --git a/samples/application_development/code_relocation/CMakeLists.txt b/samples/application_development/code_relocation/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(code_relocation)

diff --git a/samples/application_development/external_lib/CMakeLists.txt b/samples/application_development/external_lib/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(external_lib)
 

diff --git a/samples/application_development/out_of_tree_board/CMakeLists.txt b/samples/application_development/out_of_tree_board/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 # Re-direct the directory where the 'boards' directory is found from
 # $ZEPHYR_BASE to this directory.
 set(BOARD_ROOT ${CMAKE_CURRENT_LIST_DIR})

diff --git a/samples/application_development/out_of_tree_driver/CMakeLists.txt b/samples/application_development/out_of_tree_driver/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND ZEPHYR_EXTRA_MODULES
   ${CMAKE_CURRENT_SOURCE_DIR}/hello_world_module
   )
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(out_of_tree_driver)

diff --git a/samples/arch/mpu/mpu_test/CMakeLists.txt b/samples/arch/mpu/mpu_test/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(mpu_test)

diff --git a/samples/arch/smp/pi/CMakeLists.txt b/samples/arch/smp/pi/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(smp_pi)

diff --git a/samples/arch/smp/pktqueue/CMakeLists.txt b/samples/arch/smp/pktqueue/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(smp_pktqueue)

diff --git a/samples/basic/blinky/CMakeLists.txt b/samples/basic/blinky/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(blinky)
 

diff --git a/samples/basic/blinky_pwm/CMakeLists.txt b/samples/basic/blinky_pwm/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(blink_led)
 

diff --git a/samples/basic/button/CMakeLists.txt b/samples/basic/button/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(button)
 

diff --git a/samples/basic/fade_led/CMakeLists.txt b/samples/basic/fade_led/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(fade_led)
 

diff --git a/samples/basic/minimal/CMakeLists.txt b/samples/basic/minimal/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(minimal)

diff --git a/samples/basic/rgb_led/CMakeLists.txt b/samples/basic/rgb_led/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(rgb_led)
 

diff --git a/samples/basic/servo_motor/CMakeLists.txt b/samples/basic/servo_motor/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(servo_motor)
 

diff --git a/samples/basic/threads/CMakeLists.txt b/samples/basic/threads/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(threads)
 

diff --git a/samples/bluetooth/beacon/CMakeLists.txt b/samples/bluetooth/beacon/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(beacon)
 

diff --git a/samples/bluetooth/central/CMakeLists.txt b/samples/bluetooth/central/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(central)
 

diff --git a/samples/bluetooth/central_hr/CMakeLists.txt b/samples/bluetooth/central_hr/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(central_hr)
 

diff --git a/samples/bluetooth/central_ht/CMakeLists.txt b/samples/bluetooth/central_ht/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(central_ht)
 

diff --git a/samples/bluetooth/central_iso/CMakeLists.txt b/samples/bluetooth/central_iso/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(central)
 

diff --git a/samples/bluetooth/central_multilink/CMakeLists.txt b/samples/bluetooth/central_multilink/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(central_multilink)
 

diff --git a/samples/bluetooth/central_past/CMakeLists.txt b/samples/bluetooth/central_past/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(central_past)
 

diff --git a/samples/bluetooth/direction_finding_connectionless_rx/CMakeLists.txt b/samples/bluetooth/direction_finding_connectionless_rx/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 

diff --git a/samples/bluetooth/direction_finding_connectionless_tx/CMakeLists.txt b/samples/bluetooth/direction_finding_connectionless_tx/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 

diff --git a/samples/bluetooth/eddystone/CMakeLists.txt b/samples/bluetooth/eddystone/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(eddystone)
 

diff --git a/samples/bluetooth/handsfree/CMakeLists.txt b/samples/bluetooth/handsfree/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(handsfree)
 

diff --git a/samples/bluetooth/hci_pwr_ctrl/CMakeLists.txt b/samples/bluetooth/hci_pwr_ctrl/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(hci_pwr_ctrl)
 

diff --git a/samples/bluetooth/hci_rpmsg/CMakeLists.txt b/samples/bluetooth/hci_rpmsg/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(hci_rpmsg)

diff --git a/samples/bluetooth/hci_spi/CMakeLists.txt b/samples/bluetooth/hci_spi/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(hci_spi)
 

diff --git a/samples/bluetooth/hci_uart/CMakeLists.txt b/samples/bluetooth/hci_uart/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(hci_uart)

diff --git a/samples/bluetooth/hci_usb/CMakeLists.txt b/samples/bluetooth/hci_usb/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(hci_usb)
 

diff --git a/samples/bluetooth/hci_usb_h4/CMakeLists.txt b/samples/bluetooth/hci_usb_h4/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(hci_usb_h4)
 

diff --git a/samples/bluetooth/ibeacon/CMakeLists.txt b/samples/bluetooth/ibeacon/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(ibeacon)
 

diff --git a/samples/bluetooth/ipsp/CMakeLists.txt b/samples/bluetooth/ipsp/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(ipsp)