From 7a6c5710ff95abcfe93bba3f7dd4647b115df79f Mon Sep 17 00:00:00 2001 From: Reto Schneider Date: Sat, 2 Jul 2022 21:36:23 +0200 Subject: [PATCH] cmake: Update cmake_minimum_required to 3.20.0 As Zephyr currently requires CMake version 3.20.0, update all occurrences of cmake_minimum_required. Signed-off-by: Reto Schneider --- cmake/bintools/armclang/elfconvert_command.cmake | 2 +- cmake/linker/armlink/scatter_script.cmake | 2 +- cmake/linker/ld/ld_script.cmake | 2 +- cmake/package_helper.cmake | 2 +- samples/bluetooth/broadcaster/CMakeLists.txt | 2 +- samples/bluetooth/observer/CMakeLists.txt | 2 +- samples/boards/nrf/nrf53_sync_rtc/CMakeLists.txt | 2 +- samples/boards/nrf/nrf53_sync_rtc/net/CMakeLists.txt | 2 +- samples/drivers/audio/dmic/CMakeLists.txt | 2 +- samples/drivers/fpga/fpga_controller/CMakeLists.txt | 2 +- samples/drivers/fpga/fpga_controller_shell/CMakeLists.txt | 2 +- samples/drivers/spi_bitbang/CMakeLists.txt | 2 +- samples/shields/x_nucleo_53l0a1/CMakeLists.txt | 2 +- samples/subsys/shell/devmem_load/CMakeLists.txt | 2 +- samples/tfm_integration/psa_firmware/CMakeLists.txt | 2 +- samples/tfm_integration/tfm_secure_partition/CMakeLists.txt | 2 +- tests/arch/arm/arm_mem_protect/CMakeLists.txt | 2 +- tests/arch/arm64/arm64_gicv3_its/CMakeLists.txt | 2 +- tests/bluetooth/controller/ctrl_unsupported/CMakeLists.txt | 2 +- tests/bluetooth/ctrl_isoal/CMakeLists.txt | 2 +- tests/bluetooth/df/connection_cte_req/CMakeLists.txt | 2 +- tests/drivers/build_all/ieee802154/CMakeLists.txt | 2 +- tests/drivers/espi/CMakeLists.txt | 2 +- tests/lib/devicetree/api_ext/CMakeLists.txt | 2 +- tests/lib/devicetree/memory_region/CMakeLists.txt | 2 +- tests/lib/smf/CMakeLists.txt | 2 +- tests/misc/iterable_sections/CMakeLists.txt | 2 +- tests/posix/getopt/CMakeLists.txt | 2 +- tests/subsys/pm/device_wakeup_api/CMakeLists.txt | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cmake/bintools/armclang/elfconvert_command.cmake b/cmake/bintools/armclang/elfconvert_command.cmake index 6a5549b96f..7474412dc0 100644 --- a/cmake/bintools/armclang/elfconvert_command.cmake +++ b/cmake/bintools/armclang/elfconvert_command.cmake @@ -2,7 +2,7 @@ # Reason for that is because not a single command covers all use cases, # and it must therefore be possible to call individual commands, depending # on the arguments used. -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.20.0) # Handle stripping if (STRIP_DEBUG OR STRIP_ALL) diff --git a/cmake/linker/armlink/scatter_script.cmake b/cmake/linker/armlink/scatter_script.cmake index b7a5399f22..b32f67b7b0 100644 --- a/cmake/linker/armlink/scatter_script.cmake +++ b/cmake/linker/armlink/scatter_script.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.17) +cmake_minimum_required(VERSION 3.20.0) set(SORT_TYPE_NAME Lexical) diff --git a/cmake/linker/ld/ld_script.cmake b/cmake/linker/ld/ld_script.cmake index 795d3dee74..76cb5b433f 100644 --- a/cmake/linker/ld/ld_script.cmake +++ b/cmake/linker/ld/ld_script.cmake @@ -1,6 +1,6 @@ # ToDo: # - Ensure LMA / VMA sections are correctly grouped similar to scatter file creation. -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.20.0) set(SORT_TYPE_NAME SORT_BY_NAME) diff --git a/cmake/package_helper.cmake b/cmake/package_helper.cmake index 8f6a2f1a38..36741bbc95 100644 --- a/cmake/package_helper.cmake +++ b/cmake/package_helper.cmake @@ -42,7 +42,7 @@ # find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) # the 'foo.overlay' must be specified using '-DOVERLAY_CONFIG=foo.overlay' -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.20.0) # add_custom_target and set_target_properties are not supported in script mode. # However, several Zephyr CMake modules create custom target for user convenience diff --git a/samples/bluetooth/broadcaster/CMakeLists.txt b/samples/bluetooth/broadcaster/CMakeLists.txt index 3a88e02820..609d929289 100644 --- a/samples/bluetooth/broadcaster/CMakeLists.txt +++ b/samples/bluetooth/broadcaster/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(broadcaster) diff --git a/samples/bluetooth/observer/CMakeLists.txt b/samples/bluetooth/observer/CMakeLists.txt index 14d00fef71..6009ce93a5 100644 --- a/samples/bluetooth/observer/CMakeLists.txt +++ b/samples/bluetooth/observer/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(observer) diff --git a/samples/boards/nrf/nrf53_sync_rtc/CMakeLists.txt b/samples/boards/nrf/nrf53_sync_rtc/CMakeLists.txt index 5bdfc119c1..32aee7dc0a 100644 --- a/samples/boards/nrf/nrf53_sync_rtc/CMakeLists.txt +++ b/samples/boards/nrf/nrf53_sync_rtc/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) set(NET_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/sync_rtc_net-prefix/src/sync_rtc_net-build/zephyr) diff --git a/samples/boards/nrf/nrf53_sync_rtc/net/CMakeLists.txt b/samples/boards/nrf/nrf53_sync_rtc/net/CMakeLists.txt index 052f292b33..7612c9a9ce 100644 --- a/samples/boards/nrf/nrf53_sync_rtc/net/CMakeLists.txt +++ b/samples/boards/nrf/nrf53_sync_rtc/net/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) if("${BOARD}" STREQUAL "nrf5340dk_nrf5340_cpunet") message(INFO " ${BOARD} compile as slave in this sample") diff --git a/samples/drivers/audio/dmic/CMakeLists.txt b/samples/drivers/audio/dmic/CMakeLists.txt index 52cdaec64c..0c07537024 100644 --- a/samples/drivers/audio/dmic/CMakeLists.txt +++ b/samples/drivers/audio/dmic/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(dmic) diff --git a/samples/drivers/fpga/fpga_controller/CMakeLists.txt b/samples/drivers/fpga/fpga_controller/CMakeLists.txt index 9b7c5a035c..0992b615da 100644 --- a/samples/drivers/fpga/fpga_controller/CMakeLists.txt +++ b/samples/drivers/fpga/fpga_controller/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(fpga_controller) diff --git a/samples/drivers/fpga/fpga_controller_shell/CMakeLists.txt b/samples/drivers/fpga/fpga_controller_shell/CMakeLists.txt index 9b7c5a035c..0992b615da 100644 --- a/samples/drivers/fpga/fpga_controller_shell/CMakeLists.txt +++ b/samples/drivers/fpga/fpga_controller_shell/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(fpga_controller) diff --git a/samples/drivers/spi_bitbang/CMakeLists.txt b/samples/drivers/spi_bitbang/CMakeLists.txt index bfd9cc2f19..02c8fc1f52 100644 --- a/samples/drivers/spi_bitbang/CMakeLists.txt +++ b/samples/drivers/spi_bitbang/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(spi_bitbang) diff --git a/samples/shields/x_nucleo_53l0a1/CMakeLists.txt b/samples/shields/x_nucleo_53l0a1/CMakeLists.txt index 23bf1a8205..a68cbc432c 100644 --- a/samples/shields/x_nucleo_53l0a1/CMakeLists.txt +++ b/samples/shields/x_nucleo_53l0a1/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) # This sample is specific to x_nucleo_53l0a1 shield. Enforce -DSHIELD option set(SHIELD x_nucleo_53l0a1) diff --git a/samples/subsys/shell/devmem_load/CMakeLists.txt b/samples/subsys/shell/devmem_load/CMakeLists.txt index c5041b6404..25655cc267 100644 --- a/samples/subsys/shell/devmem_load/CMakeLists.txt +++ b/samples/subsys/shell/devmem_load/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) 2021 Antmicro # 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(devmem_load) diff --git a/samples/tfm_integration/psa_firmware/CMakeLists.txt b/samples/tfm_integration/psa_firmware/CMakeLists.txt index 3f78c8dd5b..894ebcadec 100644 --- a/samples/tfm_integration/psa_firmware/CMakeLists.txt +++ b/samples/tfm_integration/psa_firmware/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}) diff --git a/samples/tfm_integration/tfm_secure_partition/CMakeLists.txt b/samples/tfm_integration/tfm_secure_partition/CMakeLists.txt index 262ac042c7..69901f7392 100644 --- a/samples/tfm_integration/tfm_secure_partition/CMakeLists.txt +++ b/samples/tfm_integration/tfm_secure_partition/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) diff --git a/tests/arch/arm/arm_mem_protect/CMakeLists.txt b/tests/arch/arm/arm_mem_protect/CMakeLists.txt index 371f217648..c7635914da 100644 --- a/tests/arch/arm/arm_mem_protect/CMakeLists.txt +++ b/tests/arch/arm/arm_mem_protect/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(arm_mem_protect) diff --git a/tests/arch/arm64/arm64_gicv3_its/CMakeLists.txt b/tests/arch/arm64/arm64_gicv3_its/CMakeLists.txt index 9be5bd49a9..80d9443aa0 100644 --- a/tests/arch/arm64/arm64_gicv3_its/CMakeLists.txt +++ b/tests/arch/arm64/arm64_gicv3_its/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(arm_gicv3_its) diff --git a/tests/bluetooth/controller/ctrl_unsupported/CMakeLists.txt b/tests/bluetooth/controller/ctrl_unsupported/CMakeLists.txt index 33c9e0ef3d..aefd4f51c4 100644 --- a/tests/bluetooth/controller/ctrl_unsupported/CMakeLists.txt +++ b/tests/bluetooth/controller/ctrl_unsupported/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.20.0) if (NOT BOARD STREQUAL unit_testing) message(FATAL_ERROR "This project can only be used with '-DBOARD=unit_testing'.") diff --git a/tests/bluetooth/ctrl_isoal/CMakeLists.txt b/tests/bluetooth/ctrl_isoal/CMakeLists.txt index 82eacbb1ea..50d37d5771 100644 --- a/tests/bluetooth/ctrl_isoal/CMakeLists.txt +++ b/tests/bluetooth/ctrl_isoal/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(bluetooth_ctrl_isoal) diff --git a/tests/bluetooth/df/connection_cte_req/CMakeLists.txt b/tests/bluetooth/df/connection_cte_req/CMakeLists.txt index 1f06e9223c..937e20dd0a 100644 --- a/tests/bluetooth/df/connection_cte_req/CMakeLists.txt +++ b/tests/bluetooth/df/connection_cte_req/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(bluetooth_df_connection_cte_req) diff --git a/tests/drivers/build_all/ieee802154/CMakeLists.txt b/tests/drivers/build_all/ieee802154/CMakeLists.txt index 2820f68934..518596a02f 100644 --- a/tests/drivers/build_all/ieee802154/CMakeLists.txt +++ b/tests/drivers/build_all/ieee802154/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(build_all) diff --git a/tests/drivers/espi/CMakeLists.txt b/tests/drivers/espi/CMakeLists.txt index 87d61c4caf..1340e95aa7 100644 --- a/tests/drivers/espi/CMakeLists.txt +++ b/tests/drivers/espi/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright 2021 Google LLC # 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(espi) diff --git a/tests/lib/devicetree/api_ext/CMakeLists.txt b/tests/lib/devicetree/api_ext/CMakeLists.txt index 4a9425bab7..1a58c2fa0d 100644 --- a/tests/lib/devicetree/api_ext/CMakeLists.txt +++ b/tests/lib/devicetree/api_ext/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(devicetree_extensions) diff --git a/tests/lib/devicetree/memory_region/CMakeLists.txt b/tests/lib/devicetree/memory_region/CMakeLists.txt index eea9bf22f4..3865ea24a8 100644 --- a/tests/lib/devicetree/memory_region/CMakeLists.txt +++ b/tests/lib/devicetree/memory_region/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(memory_region) diff --git a/tests/lib/smf/CMakeLists.txt b/tests/lib/smf/CMakeLists.txt index 9d0cbff6d1..147223b028 100644 --- a/tests/lib/smf/CMakeLists.txt +++ b/tests/lib/smf/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(smf) diff --git a/tests/misc/iterable_sections/CMakeLists.txt b/tests/misc/iterable_sections/CMakeLists.txt index 71dcb0d446..fd6c0feee6 100644 --- a/tests/misc/iterable_sections/CMakeLists.txt +++ b/tests/misc/iterable_sections/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(iterable_sections) diff --git a/tests/posix/getopt/CMakeLists.txt b/tests/posix/getopt/CMakeLists.txt index 75dc98a77a..a8d0f3c98c 100644 --- a/tests/posix/getopt/CMakeLists.txt +++ b/tests/posix/getopt/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(getopt) diff --git a/tests/subsys/pm/device_wakeup_api/CMakeLists.txt b/tests/subsys/pm/device_wakeup_api/CMakeLists.txt index 31663a41b1..61fba639cb 100644 --- a/tests/subsys/pm/device_wakeup_api/CMakeLists.txt +++ b/tests/subsys/pm/device_wakeup_api/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) 2021 Intel Corporation. # 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(pm-states-test)