From d420c32d67d1b4829883ad05b9f024b3f4ed649a Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 29 Mar 2024 22:17:56 +0100 Subject: [PATCH] autotools: Sync CMake templates with CMake 3.27 --- expat/cmake/autotools/expat.cmake | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/expat/cmake/autotools/expat.cmake b/expat/cmake/autotools/expat.cmake index b984c794..56f995ec 100644 --- a/expat/cmake/autotools/expat.cmake +++ b/expat/cmake/autotools/expat.cmake @@ -3,11 +3,11 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8) message(FATAL_ERROR "CMake >= 2.8.0 required") endif() -if(CMAKE_VERSION VERSION_LESS "2.8.3") - message(FATAL_ERROR "CMake >= 2.8.3 required") +if(CMAKE_VERSION VERSION_LESS "2.8.12") + message(FATAL_ERROR "CMake >= 2.8.12 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.8.3...3.26) +cmake_policy(VERSION 2.8.12...3.27) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- @@ -63,10 +63,6 @@ set_target_properties(expat::expat PROPERTIES INTERFACE_LINK_LIBRARIES "m" ) -if(CMAKE_VERSION VERSION_LESS 2.8.12) - message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.") -endif() - # Load information for each installed configuration. file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/expat-*.cmake") foreach(_cmake_config_file IN LISTS _cmake_config_files) @@ -80,9 +76,12 @@ set(_IMPORT_PREFIX) # Loop over all imported files and verify that they actually exist foreach(_cmake_target IN LISTS _cmake_import_check_targets) - foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}") - if(NOT EXISTS "${_cmake_file}") - message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file + if(CMAKE_VERSION VERSION_LESS "3.28" + OR NOT DEFINED _cmake_import_check_xcframework_for_${_cmake_target} + OR NOT IS_DIRECTORY "${_cmake_import_check_xcframework_for_${_cmake_target}}") + foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}") + if(NOT EXISTS "${_cmake_file}") + message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file \"${_cmake_file}\" but this file does not exist. Possible reasons include: * The file was deleted, renamed, or moved to another location. @@ -91,8 +90,9 @@ but this file does not exist. Possible reasons include: \"${CMAKE_CURRENT_LIST_FILE}\" but not all the files it references. ") - endif() - endforeach() + endif() + endforeach() + endif() unset(_cmake_file) unset("_cmake_import_check_files_for_${_cmake_target}") endforeach()