Sync CS

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -399,11 +399,7 @@ endif()
 # Check getaddrinfo().
 include(PHP/CheckGetaddrinfo)
 if(TARGET PHP::CheckGetaddrinfoLibrary)
-  target_link_libraries(
-    php_config
-    INTERFACE
-      PHP::CheckGetaddrinfoLibrary
-  )
+  target_link_libraries(php_config INTERFACE PHP::CheckGetaddrinfoLibrary)
 endif()
 
 # Check copy_file_range().
@@ -766,17 +762,17 @@ block()
   if(PHP_LIBGCC)
     execute_process(
       COMMAND gcc --print-libgcc-file-name
-      OUTPUT_VARIABLE libgcc_path
+      OUTPUT_VARIABLE path
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
-    if(NOT EXISTS "${libgcc_path}")
-      message(FATAL_ERROR "Cannot locate libgcc.")
+    if(NOT EXISTS "${path}")
+      message(FATAL_ERROR "The libgcc path not found ${path}")
     endif()
 
-    message(STATUS "Explicitly linking against libgcc (${libgcc_path})")
+    message(STATUS "Explicitly linking against libgcc (${path})")
 
-    target_link_libraries(php_config INTERFACE ${libgcc_path})
+    target_link_libraries(php_config INTERFACE ${path})
   endif()
 endblock()
 
@@ -828,11 +824,9 @@ if(PHP_VALGRIND)
       PURPOSE "Necessary to enable Valgrind support."
   )
 
-  if(Valgrind_FOUND)
-    set(HAVE_VALGRIND TRUE)
-  endif()
-
   target_link_libraries(php_config INTERFACE Valgrind::Valgrind)
+
+  set(HAVE_VALGRIND TRUE)
 endif()
 add_feature_info(
   "Valgrind"
@@ -842,8 +836,6 @@ add_feature_info(
 
 # DTrace.
 if(PHP_DTRACE)
-  message(CHECK_START "Checking for DTrace support")
-
   find_package(DTrace)
   set_package_properties(
     DTrace
@@ -867,14 +859,11 @@ if(PHP_DTRACE)
       INCLUDES
         $<TARGET_PROPERTY:PHP::config,INTERFACE_INCLUDE_DIRECTORIES>
     )
+
     target_link_libraries(php_config INTERFACE DTrace::DTrace)
     target_link_libraries(php_sapi INTERFACE php_dtrace)
 
     set(HAVE_DTRACE TRUE)
-
-    message(CHECK_PASS "yes")
-  else()
-    message(CHECK_FAIL "no")
   endif()
 endif()
 add_feature_info(
@@ -885,8 +874,6 @@ add_feature_info(
 
 # Dmalloc.
 if(PHP_DMALLOC)
-  message(CHECK_START "Checking for Dmalloc support")
-
   find_package(Dmalloc)
   set_package_properties(
     Dmalloc
@@ -903,12 +890,7 @@ if(PHP_DMALLOC)
 
   target_link_libraries(php_config INTERFACE Dmalloc::Dmalloc)
 
-  if(Dmalloc_FOUND)
-    message(CHECK_PASS "yes")
-    set(HAVE_DMALLOC TRUE)
-  else()
-    message(CHECK_FAIL "no")
-  endif()
+  set(HAVE_DMALLOC TRUE)
 endif()
 add_feature_info(
   "Dmalloc"

cmake/cmake/modules/PHP/CheckGethostbynameR.cmake

@@ -29,6 +29,8 @@ https://www.gnu.org/software/autoconf-archive/ax_func_which_gethostbyname_r.html
 
   Whether `gethostbyname_r()` has 3 arguments.
 
+## Result variables
+
 * `HAVE_GETHOSTBYNAME_R`
 
   Whether `gethostbyname_r()` is available.
@@ -125,8 +127,5 @@ if(
   OR HAVE_FUNC_GETHOSTBYNAME_R_5
   OR HAVE_FUNC_GETHOSTBYNAME_R_3
 )
-  set(
-    HAVE_GETHOSTBYNAME_R TRUE
-    CACHE INTERNAL "Whether gethostbyname_r() is available."
-  )
+  set(HAVE_GETHOSTBYNAME_R TRUE)
 endif()

cmake/cmake/modules/PHP/CheckReentrantFunctions.cmake

@@ -10,41 +10,43 @@ functions on current systems and this module might be obsolete in the future.
 
 ## Cache variables
 
-* `HAVE_LOCALTIME_R`
+* `HAVE_ASCTIME_R`
 
-  Whether `localtime_r()` is available.
+  Whether `asctime_r()` is available.
 
-* `MISSING_LOCALTIME_R_DECL`
+* `HAVE_CTIME_R`
 
-  Whether `localtime_r()` is not declared.
+  Whether `ctime_r()` is available.
 
 * `HAVE_GMTIME_R`
 
   Whether `gmtime_r()` is available.
 
-* `MISSING_GMTIME_R_DECL`
+* `HAVE_LOCALTIME_R`
 
-  Whether `gmtime_r()` is not declared.
+  Whether `localtime_r()` is available.
 
-* `HAVE_ASCTIME_R`
+* `HAVE_STRTOK_R`
 
-  Whether `asctime_r()` is available.
+  Whether `strtok_r()` is available.
+
+## Result variables
 
 * `MISSING_ASCTIME_R_DECL`
 
   Whether `asctime_r()` is not declared.
 
-* `HAVE_CTIME_R`
-
-  Whether `ctime_r()` is available.
-
 * `MISSING_CTIME_R_DECL`
 
   Whether `ctime_r()` is not declared.
 
-* `HAVE_STRTOK_R`
+* `MISSING_GMTIME_R_DECL`
 
-  Whether `strtok_r()` is available.
+  Whether `gmtime_r()` is not declared.
+
+* `MISSING_LOCALTIME_R_DECL`
+
+  Whether `localtime_r()` is not declared.
 
 * `MISSING_STRTOK_R_DECL`
 
@@ -69,23 +71,20 @@ function(_php_check_reentrant_function symbol header)
 
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_QUIET TRUE)
-    check_symbol_exists(${symbol} ${header} _have_${symbol})
+    check_symbol_exists(${symbol} ${header} PHP_HAVE_DECL_${const})
   cmake_pop_check_state()
 
-  if(NOT _have_${symbol})
+  if(NOT PHP_HAVE_DECL_${const})
     message(CHECK_FAIL "missing")
 
-    set(
-      MISSING_${const}_DECL TRUE
-      CACHE INTERNAL "Define if ${symbol} is not declared."
-    )
+    set(MISSING_${const}_DECL TRUE)
   else()
     message(CHECK_PASS "found")
   endif()
 endfunction()
 
-_php_check_reentrant_function(localtime_r time.h)
-_php_check_reentrant_function(gmtime_r time.h)
 _php_check_reentrant_function(asctime_r time.h)
 _php_check_reentrant_function(ctime_r time.h)
+_php_check_reentrant_function(gmtime_r time.h)
+_php_check_reentrant_function(localtime_r time.h)
 _php_check_reentrant_function(strtok_r string.h)

cmake/cmake/modules/PHP/Set.cmake

@@ -115,6 +115,20 @@ php_set(
   VAR=auto
   ```
 
+  The following example sets variable `VAR` to value `OFF` and hides it in the
+  GUI on Windows. On other systems it sets it to `auto` by default.
+
+  ```cmake
+  include(PHP/Set)
+  php_set(
+    VAR
+    IF [[NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"]]
+    CHOICES auto ON OFF
+    ELSE_VALUE OFF
+    DOC "Conditional choices"
+  )
+  ```
+
 * When `CHOICES_OPTIONAL` is given, the variable value will not be required to
   match one of the list items. By default, when using `CHOICES`, the variable
   value must match one of the list items; otherwise, a fatal error is thrown.

cmake/sapi/phpdbg/CMakeLists.txt

@@ -100,7 +100,7 @@ endif()
 # Executable and library.
 ################################################################################
 
-set(php_phpdbg_sources
+set(phpdbgSources
   phpdbg_bp.c
   phpdbg_break.c
   phpdbg_btree.c
@@ -124,7 +124,7 @@ set(php_phpdbg_sources
   phpdbg.c
 )
 
-add_executable(php_sapi_phpdbg ${php_phpdbg_sources})
+add_executable(php_sapi_phpdbg ${phpdbgSources})
 add_executable(PHP::sapi::phpdbg ALIAS php_sapi_phpdbg)
 
 target_compile_definitions(
@@ -222,7 +222,7 @@ if(PHP_SAPI_PHPDBG_SHARED)
 
   set_target_properties(php_sapi_phpdbg_shared PROPERTIES OUTPUT_NAME phpdbg)
 
-  target_sources(php_sapi_phpdbg_shared PRIVATE ${php_phpdbg_sources})
+  target_sources(php_sapi_phpdbg_shared PRIVATE ${phpdbgSources})
 
   target_compile_definitions(
     php_sapi_phpdbg_shared