Build: Bump CMake mini version to 3.21

David Hu · Anton-TF · commit 1249f0d4b9e8 · 2024-03-05T14:10:34.000+01:00
CMake 3.15 is a bit out-of-date.
Bump mini version to 3.21 to take advantage of newer version.

Change-Id: I1162aebbfb50507925d6aa86546dcfc41b7aa4de
Signed-off-by: David Hu &lt;david.hu@arm.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 # CMake 3.21 and above requests projects to specify cpu/arch compile and link flags explicitly in
 # Armclang. Link: https://cmake.org/cmake/help/latest/policy/CMP0123.html
diff --git a/bl2/CMakeLists.txt b/bl2/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 project("Bootloader" VERSION 0.1.0 LANGUAGES C ASM)
 
diff --git a/bl2/ext/mcuboot/CMakeLists.txt b/bl2/ext/mcuboot/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 #------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 add_library(mcuboot_config INTERFACE)
diff --git a/cmake/spe-CMakeLists.cmake b/cmake/spe-CMakeLists.cmake
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 #-------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 # This CMake script is prepard by TF-M for building the non-secure side
 # application and not used in secure build a tree being for export only.
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 add_custom_target(docs)
 
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
@@ -7,7 +7,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0076 NEW)
 cmake_policy(SET CMP0079 NEW)
 
diff --git a/lib/ext/cryptocell-312-runtime/CMakeLists.txt b/lib/ext/cryptocell-312-runtime/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 project("CC312 Runtime Library" LANGUAGES C ASM)
 
diff --git a/lib/ext/qcbor/CMakeLists.txt b/lib/ext/qcbor/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 include(FetchContent)
 set(FETCHCONTENT_QUIET FALSE)
diff --git a/lib/ext/t_cose/CMakeLists.txt b/lib/ext/t_cose/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 include(${CMAKE_CURRENT_LIST_DIR}/tfm_t_cose.cmake)
 
diff --git a/lib/ext/t_cose/tfm_t_cose.cmake b/lib/ext/t_cose/tfm_t_cose.cmake
@@ -5,7 +5,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 ################################ t_cose defs ###################################
 
diff --git a/lib/fih/CMakeLists.txt b/lib/fih/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 add_library(tfm_fih_headers INTERFACE)
 add_library(tfm_fih STATIC)
diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt
@@ -6,7 +6,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 #-------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0076 NEW)
 cmake_policy(SET CMP0079 NEW)
 
diff --git a/platform/ns/toolchain_ns_ARMCLANG.cmake b/platform/ns/toolchain_ns_ARMCLANG.cmake
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 #-------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 SET(CMAKE_SYSTEM_NAME Generic)
 
diff --git a/secure_fw/CMakeLists.txt b/secure_fw/CMakeLists.txt
@@ -8,7 +8,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 add_executable(tfm_s)
 add_library(secure_fw INTERFACE)
diff --git a/secure_fw/partitions/CMakeLists.txt b/secure_fw/partitions/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 add_library(tfm_partitions INTERFACE)
 target_link_libraries(tfm_partitions
diff --git a/secure_fw/partitions/crypto/CMakeLists.txt b/secure_fw/partitions/crypto/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 
 find_package(Python3)
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 add_library(tfm_psa_rot_partition_crypto STATIC)
diff --git a/secure_fw/partitions/firmware_update/CMakeLists.txt b/secure_fw/partitions/firmware_update/CMakeLists.txt
@@ -9,7 +9,7 @@ if (NOT TFM_PARTITION_FIRMWARE_UPDATE)
     return()
 endif()
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 add_library(tfm_psa_rot_partition_fwu STATIC)
diff --git a/secure_fw/partitions/firmware_update/bootloader/mcuboot/CMakeLists.txt b/secure_fw/partitions/firmware_update/bootloader/mcuboot/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 #-------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 add_library(tfm_fwu_mcuboot_util INTERFACE)
diff --git a/secure_fw/partitions/idle_partition/CMakeLists.txt b/secure_fw/partitions/idle_partition/CMakeLists.txt
@@ -12,7 +12,7 @@ if (NOT CONFIG_TFM_FLIH_API AND NOT CONFIG_TFM_SLIH_API AND
     return()
 endif()
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 target_sources(tfm_spm
diff --git a/secure_fw/partitions/initial_attestation/CMakeLists.txt b/secure_fw/partitions/initial_attestation/CMakeLists.txt
@@ -9,7 +9,7 @@ if (NOT TFM_PARTITION_INITIAL_ATTESTATION)
     return()
 endif()
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 configure_file(${CMAKE_SOURCE_DIR}/interface/include/psa/initial_attestation.h.in
diff --git a/secure_fw/partitions/internal_trusted_storage/CMakeLists.txt b/secure_fw/partitions/internal_trusted_storage/CMakeLists.txt
@@ -9,7 +9,7 @@ if (NOT TFM_PARTITION_INTERNAL_TRUSTED_STORAGE)
     return()
 endif()
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 add_library(tfm_psa_rot_partition_its STATIC)
diff --git a/secure_fw/partitions/lib/runtime/CMakeLists.txt b/secure_fw/partitions/lib/runtime/CMakeLists.txt
@@ -7,7 +7,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 add_library(tfm_sprt STATIC)
 
diff --git a/secure_fw/partitions/ns_agent_mailbox/CMakeLists.txt b/secure_fw/partitions/ns_agent_mailbox/CMakeLists.txt
@@ -11,7 +11,7 @@ if (NOT TFM_PARTITION_NS_AGENT_MAILBOX)
     return()
 endif()
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 add_library(tfm_psa_rot_partition_ns_agent_mailbox STATIC)
diff --git a/secure_fw/partitions/ns_agent_tz/CMakeLists.txt b/secure_fw/partitions/ns_agent_tz/CMakeLists.txt
@@ -11,7 +11,7 @@ if (NOT TFM_PARTITION_NS_AGENT_TZ)
     return()
 endif()
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 target_sources(tfm_partitions
diff --git a/secure_fw/partitions/platform/CMakeLists.txt b/secure_fw/partitions/platform/CMakeLists.txt
@@ -9,7 +9,7 @@ if (NOT TFM_PARTITION_PLATFORM)
     return()
 endif()
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 add_library(tfm_psa_rot_partition_platform STATIC
diff --git a/secure_fw/partitions/protected_storage/CMakeLists.txt b/secure_fw/partitions/protected_storage/CMakeLists.txt
@@ -9,7 +9,7 @@ if (NOT TFM_PARTITION_PROTECTED_STORAGE)
     return()
 endif()
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 cmake_policy(SET CMP0079 NEW)
 
 add_library(tfm_app_rot_partition_ps STATIC)
diff --git a/secure_fw/spm/CMakeLists.txt b/secure_fw/spm/CMakeLists.txt
@@ -8,7 +8,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 if(PSA_FRAMEWORK_HAS_MM_IOVEC)
     message(NOTICE "**** MM-IOVEC is enabled for memory and runtime optimizations for larger buffers, ****\n"
diff --git a/toolchain_ARMCLANG.cmake b/toolchain_ARMCLANG.cmake
@@ -6,7 +6,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 #-------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 SET(CMAKE_SYSTEM_NAME Generic)
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 #-------------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 find_package(Python3)
 
 ############################### Manifest lists declaration #####################

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#-------------------------------------------------------------------------------`
`9`	`9`
`10`		`-cmake_minimum_required(VERSION 3.15)`
	`10`	`+cmake_minimum_required(VERSION 3.21)`
`11`	`11`
`12`	`12`	`# CMake 3.21 and above requests projects to specify cpu/arch compile and link flags explicitly in`
`13`	`13`	`# Armclang. Link: https://cmake.org/cmake/help/latest/policy/CMP0123.html`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#`
`6`	`6`	`#-------------------------------------------------------------------------------`
`7`	`7`
`8`		`-cmake_minimum_required(VERSION 3.15)`
	`8`	`+cmake_minimum_required(VERSION 3.21)`
`9`	`9`
`10`	`10`	`project("Bootloader" VERSION 0.1.0 LANGUAGES C ASM)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# SPDX-License-Identifier: BSD-3-Clause`
`5`	`5`	`#`
`6`	`6`	`#-------------------------------------------------------------------------------`
`7`		`-cmake_minimum_required(VERSION 3.15)`
	`7`	`+cmake_minimum_required(VERSION 3.21)`
`8`	`8`
`9`	`9`	`# This CMake script is prepard by TF-M for building the non-secure side`
`10`	`10`	`# application and not used in secure build a tree being for export only.`