Simplify usage and make configuration extendable

Author: petk

cmake/Zend/cmake/GenerateGrammar.cmake

@@ -17,6 +17,7 @@ php_bison(
   zend_ini_parser.y
   ${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_parser.c
   HEADER
+  ADD_DEFAULT_OPTIONS
   ${verbose}
   CODEGEN
 )
@@ -26,6 +27,7 @@ php_bison(
   zend_language_parser.y
   ${CMAKE_CURRENT_SOURCE_DIR}/zend_language_parser.c
   HEADER
+  ADD_DEFAULT_OPTIONS
   ${verbose}
   CODEGEN
 )
@@ -103,7 +105,7 @@ php_re2c(
   zend_ini_scanner.l
   ${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_scanner.c
   HEADER ${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_scanner_defs.h
-  APPEND
+  ADD_DEFAULT_OPTIONS
   OPTIONS
     --bit-vectors
     --case-inverted
@@ -118,7 +120,7 @@ php_re2c(
   zend_language_scanner.l
   ${CMAKE_CURRENT_SOURCE_DIR}/zend_language_scanner.c
   HEADER ${CMAKE_CURRENT_SOURCE_DIR}/zend_language_scanner_defs.h
-  APPEND
+  ADD_DEFAULT_OPTIONS
   OPTIONS
     --bit-vectors
     --case-inverted

cmake/cmake/modules/FindBISON.cmake

@@ -3,16 +3,11 @@
 
 Find `bison`, the general-purpose parser generator, command-line executable.
 
-This module extends the upstream CMake `FindBISON` module.
+This module extends the CMake `FindBISON` module.
 See: https://cmake.org/cmake/help/latest/module/FindBISON.html
 #]=============================================================================]
 
 include(FeatureSummary)
-include(FindPackageHandleStandardArgs)
-
-################################################################################
-# Configuration.
-################################################################################
 
 set_package_properties(
   BISON
@@ -21,75 +16,6 @@ set_package_properties(
     DESCRIPTION "General-purpose parser generator"
 )
 
-# Find package with upstream CMake module; override CMAKE_MODULE_PATH to prevent
-# the maximum nesting/recursion depth error on some systems, like macOS.
-#set(_php_cmake_module_path ${CMAKE_MODULE_PATH})
-#unset(CMAKE_MODULE_PATH)
-#include(FindBISON)
-#set(CMAKE_MODULE_PATH ${_php_cmake_module_path})
-#unset(_php_cmake_module_path)
-
-################################################################################
-# Find the executable.
-################################################################################
-
-set(_reason "")
-
-find_program(
-  BISON_EXECUTABLE
-  NAMES bison win-bison win_bison
-  DOC "The path to the bison executable"
-)
-mark_as_advanced(BISON_EXECUTABLE)
-
-if(NOT BISON_EXECUTABLE)
-  string(APPEND _reason "The bison command-line executable not found. ")
-endif()
-
-################################################################################
-# Check version.
-################################################################################
-
-block(PROPAGATE BISON_VERSION _reason)
-  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)
-    set(test IS_EXECUTABLE)
-  else()
-    set(test EXISTS)
-  endif()
-
-  if(${test} ${BISON_EXECUTABLE})
-    execute_process(
-      COMMAND ${BISON_EXECUTABLE} --version
-      OUTPUT_VARIABLE version
-      RESULT_VARIABLE result
-      ERROR_QUIET
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-
-    if(NOT result EQUAL 0)
-      string(APPEND _reason "Command ${BISON_EXECUTABLE} --version failed. ")
-    elseif(version)
-      # Bison++
-      if(version MATCHES "^bison\\+\\+ Version ([^,]+)")
-        set(BISON_VERSION "${CMAKE_MATCH_1}")
-      # GNU Bison
-      elseif(version MATCHES "^bison \\(GNU Bison\\) ([^\n]+)\n")
-        set(BISON_VERSION "${CMAKE_MATCH_1}")
-      elseif(version MATCHES "^GNU Bison (version )?([^\n]+)")
-        set(BISON_VERSION "${CMAKE_MATCH_2}")
-      else()
-        string(APPEND _reason "Invalid version format. ")
-      endif()
-    endif()
-  endif()
-endblock()
-
-find_package_handle_standard_args(
-  BISON
-  REQUIRED_VARS BISON_EXECUTABLE BISON_VERSION
-  VERSION_VAR BISON_VERSION
-  HANDLE_VERSION_RANGE
-  REASON_FAILURE_MESSAGE "${_reason}"
-)
-
-unset(_reason)
+# Include CMake find module. Absolute path prevents the maximum
+# nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindBISON.cmake)