From 64ba75ca905798d697c650a1d1a4b2bff1b3d0b3 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 6 Mar 2025 13:42:18 +0100 Subject: [PATCH] cmake: fix detection pre-fills for iOS Follow-up to 1ecf2f11136f967deff6d2c124127250d2756c48 #16585 Follow-up to e7adf3e83747c2915c671f2e560cde6f3d4a4905 #15841 Closes #16594 --- CMake/unix-cache.cmake | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/CMake/unix-cache.cmake b/CMake/unix-cache.cmake index e0e1d8f947..f76c639149 100644 --- a/CMake/unix-cache.cmake +++ b/CMake/unix-cache.cmake @@ -59,11 +59,7 @@ endif() set(HAVE_FCNTL 1) set(HAVE_FCNTL_H 1) set(HAVE_FCNTL_O_NONBLOCK 1) -if(CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(HAVE_FILE_OFFSET_BITS 0) -else() - set(HAVE_FILE_OFFSET_BITS 1) -endif() +set(HAVE_FILE_OFFSET_BITS 1) set(HAVE_FNMATCH 1) set(HAVE_FREEADDRINFO 1) set(HAVE_FSEEKO 1) @@ -222,23 +218,14 @@ set(HAVE_SIGINTERRUPT 1) set(HAVE_SIGNAL 1) set(HAVE_SIGSETJMP 1) set(HAVE_SNPRINTF 1) -if(CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(HAVE_SOCKADDR_IN6_SIN6_ADDR 0) -else() - set(HAVE_SOCKADDR_IN6_SIN6_ADDR 1) -endif() +set(HAVE_SOCKADDR_IN6_SIN6_ADDR 1) set(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1) set(HAVE_SOCKET 1) set(HAVE_SOCKETPAIR 1) set(HAVE_STDATOMIC_H 1) set(HAVE_STDBOOL_H 1) -if(CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(HAVE_STDDEF_H 0) - set(HAVE_STDINT_H 0) -else() - set(HAVE_STDDEF_H 1) - set(HAVE_STDINT_H 1) -endif() +set(HAVE_STDDEF_H 1) +set(HAVE_STDINT_H 1) set(HAVE_STRCASECMP 1) set(HAVE_STRCMPI 0) set(HAVE_STRDUP 1) -- 2.47.3