Sync booleans

- CMake variables (TRUE/FALSE/ON/OFF)
- Preprocessor macros simplified where possible
- option() default value is OFF
- Missing ZEND_ENABLE_STATIC_TSRMLS_CACHE added to phpdbg shared module
- FindSendmail refactored also for Windows usage
- Some cache variables converted to regular/local/directory variables

Author: petk

bin/php.cmake

@@ -184,9 +184,9 @@ function(php_check_url url result)
   )
 
   if(status EQUAL 0)
-    set(${result} 1)
+    set(${result} TRUE)
   else()
-    set(${result} 0)
+    set(${result} FALSE)
   endif()
 
   return(PROPAGATE ${result})

cmake/Zend/CMakeLists.txt

@@ -310,7 +310,7 @@ target_include_directories(
 target_compile_definitions(
   zend
   PRIVATE
-    ZEND_ENABLE_STATIC_TSRMLS_CACHE=1
+    ZEND_ENABLE_STATIC_TSRMLS_CACHE
   PUBLIC
     $<$<PLATFORM_ID:Windows>:LIBZEND_EXPORTS>
 )

cmake/Zend/cmake/CheckDlsym.cmake

@@ -30,7 +30,7 @@ check_include_file(dlfcn.h HAVE_DLFCN_H)
 
 block()
   if(HAVE_DLFCN_H)
-    set(definitions "-DHAVE_DLFCN_H=1")
+    set(definitions "-DHAVE_DLFCN_H")
   endif()
 
   try_run(

cmake/cmake/CMakeDefaults.cmake

@@ -35,25 +35,23 @@ set(CMAKE_SHARED_MODULE_PREFIX_CXX "")
 set(CMAKE_STATIC_LIBRARY_PREFIX_CXX "")
 
 # Whether to enable verbose output from Makefile builds.
-option(CMAKE_VERBOSE_MAKEFILE "Enable verbose output from Makefile builds" OFF)
+option(CMAKE_VERBOSE_MAKEFILE "Enable verbose output from Makefile builds")
 mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
 
 # Whether to show message context in configuration log.
 option(
   CMAKE_MESSAGE_CONTEXT_SHOW
   "Show message context in configuration log, where possible"
-  OFF
 )
 mark_as_advanced(CMAKE_MESSAGE_CONTEXT_SHOW)
 
 # Whether to build all libraries as shared.
-option(BUILD_SHARED_LIBS "Build enabled PHP extensions as shared libraries" OFF)
+option(BUILD_SHARED_LIBS "Build enabled PHP extensions as shared libraries")
 
 # Treat all compile warnings as errors at the build phase, if compiler supports
 # such compile option, like -Werror, /WX, or similar.
 option(
   CMAKE_COMPILE_WARNING_AS_ERROR
   "Treat all compile warnings as errors at the build phase"
-  OFF
 )
 mark_as_advanced(CMAKE_COMPILE_WARNING_AS_ERROR)

cmake/cmake/Configuration.cmake

@@ -92,10 +92,10 @@ mark_as_advanced(PHP_PROGRAM_PREFIX)
 set(PHP_PROGRAM_SUFFIX "" CACHE STRING "Append suffix to the program names")
 mark_as_advanced(PHP_PROGRAM_SUFFIX)
 
-option(PHP_RE2C_CGOTO "Enable computed goto GCC extension with re2c" OFF)
+option(PHP_RE2C_CGOTO "Enable computed goto GCC extension with re2c")
 mark_as_advanced(PHP_RE2C_CGOTO)
 
-option(PHP_THREAD_SAFETY "Enable thread safety (ZTS)" OFF)
+option(PHP_THREAD_SAFETY "Enable thread safety (ZTS)")
 
 cmake_dependent_option(
   PHP_USE_RTLD_NOW
@@ -127,10 +127,10 @@ mark_as_advanced(PHP_DEFAULT_SHORT_OPEN_TAG)
 option(PHP_IPV6 "Enable IPv6 support" ON)
 mark_as_advanced(PHP_IPV6)
 
-option(PHP_DMALLOC "Enable the Dmalloc memory debugger library" OFF)
+option(PHP_DMALLOC "Enable the Dmalloc memory debugger library")
 mark_as_advanced(PHP_DMALLOC)
 
-option(PHP_DTRACE "Enable DTrace support" OFF)
+option(PHP_DTRACE "Enable DTrace support")
 mark_as_advanced(PHP_DTRACE)
 
 set(PHP_FD_SETSIZE "" CACHE STRING "Size of file descriptor sets")
@@ -139,30 +139,25 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND PHP_FD_SETSIZE STREQUAL "")
 endif()
 mark_as_advanced(PHP_FD_SETSIZE)
 
-option(PHP_VALGRIND "Enable the Valgrind support" OFF)
+option(PHP_VALGRIND "Enable the Valgrind support")
 mark_as_advanced(PHP_VALGRIND)
 
 option(
   PHP_MEMORY_SANITIZER
   "Enable the memory sanitizer compiler options (Clang only)"
-  OFF
 )
 mark_as_advanced(PHP_MEMORY_SANITIZER)
 
-option(PHP_ADDRESS_SANITIZER "Enable the address sanitizer compiler option" OFF)
+option(PHP_ADDRESS_SANITIZER "Enable the address sanitizer compiler option")
 mark_as_advanced(PHP_ADDRESS_SANITIZER)
 
-option(
-  PHP_UNDEFINED_SANITIZER
-  "Enable the undefined sanitizer compiler option"
-  OFF
-)
+option(PHP_UNDEFINED_SANITIZER "Enable the undefined sanitizer compiler option")
 mark_as_advanced(PHP_UNDEFINED_SANITIZER)
 
-option(PHP_GCOV "Enable GCOV code coverage and include GCOV symbols" OFF)
+option(PHP_GCOV "Enable GCOV code coverage and include GCOV symbols")
 mark_as_advanced(PHP_GCOV)
 
-option(PHP_LIBGCC "Explicitly link against libgcc" OFF)
+option(PHP_LIBGCC "Explicitly link against libgcc")
 mark_as_advanced(PHP_LIBGCC)
 
 option(PHP_CCACHE "Use ccache if available on the system" ON)

cmake/cmake/ConfigureChecks.cmake

@@ -189,7 +189,7 @@ if(SIZEOF_PTRDIFF_T STREQUAL "")
     "Couldn't determine the ptrdiff_t size, setting it to ${SIZEOF_PTRDIFF_T}."
   )
 endif()
-set(HAVE_PTRDIFF_T 1)
+set(HAVE_PTRDIFF_T TRUE)
 
 check_type_size("size_t" SIZEOF_SIZE_T)
 if(SIZEOF_SIZE_T STREQUAL "")
@@ -391,7 +391,7 @@ include(PHP/CheckFopencookie)
 # component of the path has execute but not read permissions.
 message(CHECK_START "Checking for broken getcwd()")
 if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-  set(HAVE_BROKEN_GETCWD 1 CACHE INTERNAL "Define if system has broken getcwd")
+  set(HAVE_BROKEN_GETCWD TRUE)
   message(CHECK_PASS "yes")
 else()
   message(CHECK_FAIL "no")
@@ -814,8 +814,8 @@ if(PHP_GCOV)
 
   if(TARGET Gcov::Gcov)
     target_link_libraries(php_configuration INTERFACE Gcov::Gcov)
-
     gcov_generate_report()
+    set(HAVE_GCOV TRUE)
   endif()
 endif()
 
@@ -830,7 +830,7 @@ if(PHP_VALGRIND)
   )
 
   if(Valgrind_FOUND)
-    set(HAVE_VALGRIND 1)
+    set(HAVE_VALGRIND TRUE)
   endif()
 
   target_link_libraries(php_configuration INTERFACE Valgrind::Valgrind)

cmake/cmake/Requirements.cmake

@@ -118,7 +118,7 @@ if(
 endif()
 
 ################################################################################
-# Find sendmail binary.
+# Find mailer.
 ################################################################################
 find_package(Sendmail)
 

cmake/cmake/modules/FindGcov.cmake

@@ -16,7 +16,6 @@ Module defines the following `IMPORTED` target(s):
 * `Gcov_GCOVR_EXECUTABLE` - The gcovr program executable.
 * `Gcov_GENHTML_EXECUTABLE` - The genhtml program executable.
 * `Gcov_LCOV_EXECUTABLE` - The lcov program executable.
-* `HAVE_GCOV` - Whether the Gcov is available.
 
 ## Macros provided by this module
 
@@ -88,8 +87,6 @@ find_package_handle_standard_args(
 unset(_reason)
 
 if(Gcov_FOUND AND NOT TARGET Gcov::Gcov)
-  set(HAVE_GCOV 1 CACHE INTERNAL "Whether GCOV is available.")
-
   add_library(Gcov::Gcov INTERFACE IMPORTED)
 
   set_target_properties(

cmake/cmake/modules/FindSendmail.cmake

@@ -1,16 +1,20 @@
 #[=============================================================================[
 # FindSendmail
 
-Find the `sendmail` program.
+This module finds mailer program for PHP and sets sensible defaults based on the
+target system. On Windows, PHP has built-in mailer (sendmail.c), on *nix systems
+either `sendmail` is used if found, or a general default value is set to
+`/usr/sbin/sendmail`.
 
 ## Result variables
 
-* `Sendmail_FOUND` - Whether sendmail has been found.
+* `Sendmail_FOUND` - Whether mailer has been found.
+* `PROG_SENDMAIL` - Path to the sendmail executable program, either found by
+  the module or set to a sensible default value.
 
 ## Cache variables
 
-* `Sendmail_EXECUTABLE` - Path to the sendmail executable, if found.
-* `PROG_SENDMAIL` - Path to the sendmail program.
+* `Sendmail_EXECUTABLE` - Path to the sendmail executable program, if found.
 #]=============================================================================]
 
 include(FeatureSummary)
@@ -23,29 +27,40 @@ set_package_properties(
     DESCRIPTION "Mail Transport Agent"
 )
 
-find_program(
-  Sendmail_EXECUTABLE
-  NAMES sendmail
-  DOC "The path to the sendmail executable"
-)
+set(_reason)
 
-if(Sendmail_EXECUTABLE)
-  set(_sendmail ${Sendmail_EXECUTABLE})
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(_sendmailIsBuiltInMsg "PHP built-in mailer (Windows)")
+  set(_sendmailRequiredVars _sendmailIsBuiltInMsg)
 else()
-  set(_sendmail "/usr/sbin/sendmail")
-endif()
+  find_program(
+    Sendmail_EXECUTABLE
+    NAMES sendmail
+    DOC "The path to the sendmail executable"
+  )
+  mark_as_advanced(Sendmail_EXECUTABLE)
 
-# TODO: Should this be result variable?
-set(PROG_SENDMAIL "${_sendmail}" CACHE INTERNAL "Path to sendmail executable")
+  set(_sendmailRequiredVars Sendmail_EXECUTABLE)
 
-mark_as_advanced(Sendmail_EXECUTABLE)
+  if(Sendmail_EXECUTABLE)
+    set(PROG_SENDMAIL ${Sendmail_EXECUTABLE})
+  else()
+    set(PROG_SENDMAIL "/usr/sbin/sendmail")
+  endif()
+
+  set(
+    _reason
+    "sendmail not found. Default set to ${PROG_SENDMAIL}.
+    It can be overridden with 'sendmail_path' php.ini directive."
+  )
+endif()
 
 find_package_handle_standard_args(
   Sendmail
-  REQUIRED_VARS Sendmail_EXECUTABLE
-  REASON_FAILURE_MESSAGE
-    "sendmail not found, setting default to ${_sendmail}.
-    It can be overridden in php.ini with sendmail_path directive."
+  REQUIRED_VARS ${_sendmailRequiredVars}
+  REASON_FAILURE_MESSAGE "${_reason}"
 )
 
-unset(_sendmail)
+unset(_reason)
+unset(_sendmailIsBuiltInMsg)
+unset(_sendmailRequiredVars)

cmake/cmake/modules/PHP/CheckWrite.cmake

@@ -32,7 +32,7 @@ cmake_push_check_state(RESET)
   check_include_file(unistd.h HAVE_UNISTD_H)
 
   if(HAVE_UNISTD_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_UNISTD_H=1)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_UNISTD_H)
   endif()
 
   check_source_runs(C [[