Sync cache variable names

Author: petk

cmake/cmake/checks/CheckAlignof.cmake

@@ -15,7 +15,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 endif()
 
 # Skip in consecutive configuration phases.
-if(NOT DEFINED PHP_HAS_ALIGNOF)
+if(NOT DEFINED PHP_HAVE_ALIGNOF)
   message(CHECK_START "Checking whether the compiler supports __alignof__")
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_QUIET TRUE)
@@ -26,13 +26,13 @@ if(NOT DEFINED PHP_HAS_ALIGNOF)
         (void)align;
         return 0;
       }
-    ]] PHP_HAS_ALIGNOF)
+    ]] PHP_HAVE_ALIGNOF)
   cmake_pop_check_state()
-  if(PHP_HAS_ALIGNOF)
+  if(PHP_HAVE_ALIGNOF)
     message(CHECK_PASS "yes")
   else()
     message(CHECK_FAIL "no")
   endif()
 endif()
 
-set(HAVE_ALIGNOF ${PHP_HAS_ALIGNOF})
+set(HAVE_ALIGNOF ${PHP_HAVE_ALIGNOF})

cmake/cmake/checks/CheckAlloca.cmake

@@ -20,20 +20,21 @@ include(CheckSymbolExists)
 # On Windows, alloca is defined in malloc.h as _alloca. Cache variables are
 # overridden to speed up the check and commands used for documentation purposes.
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  set(PHP_HAS_ALLOCA_H FALSE)
-  set(PHP_HAS_ALLOCA TRUE)
-  check_symbol_exists(alloca malloc.h PHP_HAS_ALLOCA)
+  set(PHP_HAVE_ALLOCA_H FALSE)
+  set(PHP_HAVE_ALLOCA TRUE)
+endif()
+
+check_include_files(alloca.h PHP_HAVE_ALLOCA_H)
+
+if(PHP_HAVE_ALLOCA_H)
+  # Most *.nix systems (Linux, macOS, Solaris/illumos, Haiku).
+  check_symbol_exists(alloca alloca.h PHP_HAVE_ALLOCA)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  check_symbol_exists(alloca malloc.h PHP_HAVE_ALLOCA)
 else()
-  check_include_files(alloca.h PHP_HAS_ALLOCA_H)
-
-  if(PHP_HAS_ALLOCA_H)
-    # Most *.nix systems (Linux, macOS, Solaris/illumos, Haiku).
-    check_symbol_exists(alloca alloca.h PHP_HAS_ALLOCA)
-  else()
-    # BSD-based systems, old Linux.
-    check_symbol_exists(alloca stdlib.h PHP_HAS_ALLOCA)
-  endif()
+  # BSD-based systems, old Linux.
+  check_symbol_exists(alloca stdlib.h PHP_HAVE_ALLOCA)
 endif()
 
-set(HAVE_ALLOCA ${PHP_HAS_ALLOCA})
-set(HAVE_ALLOCA_H ${PHP_HAS_ALLOCA_H})
+set(HAVE_ALLOCA ${PHP_HAVE_ALLOCA})
+set(HAVE_ALLOCA_H ${PHP_HAVE_ALLOCA_H})

cmake/cmake/checks/CheckCopyFileRange.cmake

@@ -17,7 +17,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 endif()
 
 # Skip in consecutive configuration phases.
-if(NOT DEFINED PHP_HAS_COPY_FILE_RANGE)
+if(NOT DEFINED PHP_HAVE_COPY_FILE_RANGE)
   message(CHECK_START "Checking for copy_file_range")
 
   cmake_push_check_state(RESET)
@@ -42,14 +42,14 @@ if(NOT DEFINED PHP_HAS_COPY_FILE_RANGE)
         (void)copy_file_range(-1, 0, -1, 0, 0, 0);
         return 0;
       }
-    ]] PHP_HAS_COPY_FILE_RANGE)
+    ]] PHP_HAVE_COPY_FILE_RANGE)
   cmake_pop_check_state()
 
-  if(PHP_HAS_COPY_FILE_RANGE)
+  if(PHP_HAVE_COPY_FILE_RANGE)
     message(CHECK_PASS "yes")
   else()
     message(CHECK_FAIL "no")
   endif()
 endif()
 
-set(HAVE_COPY_FILE_RANGE ${PHP_HAS_COPY_FILE_RANGE})
+set(HAVE_COPY_FILE_RANGE ${PHP_HAVE_COPY_FILE_RANGE})