From 49c420cd2dcc20379c59ca6cdc96a25576218877 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 24 Mar 2023 05:06:43 +0100 Subject: autotools: Sync CMake templates with CMake 3.24 --- expat/cmake/autotools/expat-config-version.cmake.in | 7 +------ expat/cmake/autotools/expat.cmake | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/expat/cmake/autotools/expat-config-version.cmake.in b/expat/cmake/autotools/expat-config-version.cmake.in index abdda6e9..10fa146f 100644 --- a/expat/cmake/autotools/expat-config-version.cmake.in +++ b/expat/cmake/autotools/expat-config-version.cmake.in @@ -52,13 +52,8 @@ else() endif() -# if the installed project requested no architecture check, don't perform the check -if("FALSE") - return() -endif() - # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it: -if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@ac_cv_sizeof_void_p@" STREQUAL "") +if(CMAKE_SIZEOF_VOID_P STREQUAL "" OR "@ac_cv_sizeof_void_p@" STREQUAL "") return() endif() diff --git a/expat/cmake/autotools/expat.cmake b/expat/cmake/autotools/expat.cmake index 7d737248..88f78939 100644 --- a/expat/cmake/autotools/expat.cmake +++ b/expat/cmake/autotools/expat.cmake @@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3") message(FATAL_ERROR "CMake >= 2.8.3 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.8.3...3.23) +cmake_policy(VERSION 2.8.3...3.24) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- -- cgit v1.2.1