From 65429b9af6a2c99d340ab2dcddd41dab201f399c Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Sat, 13 May 2023 11:42:25 +0200 Subject: Reland "[CMake] Bumps minimum version to 3.20.0." The owner of the last two failing buildbots updated CMake. This reverts commit e8e8707b4aa6e4cc04c0cffb2de01d2de71165fc. --- libunwind/CMakeLists.txt | 2 +- libunwind/src/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'libunwind') diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 6f12a160307d..bd49dfbe53b3 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -2,7 +2,7 @@ # Setup Project #=============================================================================== -cmake_minimum_required(VERSION 3.13.4) +cmake_minimum_required(VERSION 3.20.0) set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt index 2eabbe06d1d1..ef3417443872 100644 --- a/libunwind/src/CMakeLists.txt +++ b/libunwind/src/CMakeLists.txt @@ -30,8 +30,7 @@ set(LIBUNWIND_ASM_SOURCES # CMake doesn't work correctly with assembly on AIX. Workaround by compiling # as C files as well. if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR - (MINGW AND CMAKE_VERSION VERSION_LESS 3.17) OR - (${CMAKE_SYSTEM_NAME} MATCHES "AIX")) + (MINGW AND CMAKE_VERSION VERSION_LESS 3.17)) set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C) endif() -- cgit v1.2.1