summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2023-03-24 05:06:43 +0100
committerSebastian Pipping <sebastian@pipping.org>2023-03-24 05:06:43 +0100
commit49c420cd2dcc20379c59ca6cdc96a25576218877 (patch)
tree2b889a665df57d42522323ea9bdf33cea2b36dbc
parenta256094b1def628e1c7d63b2f30d13c0b3555790 (diff)
downloadlibexpat-git-49c420cd2dcc20379c59ca6cdc96a25576218877.tar.gz
autotools: Sync CMake templates with CMake 3.24
-rw-r--r--expat/cmake/autotools/expat-config-version.cmake.in7
-rw-r--r--expat/cmake/autotools/expat.cmake2
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.
#----------------------------------------------------------------