Merge branch 'PHP-8.4' into PHP-8.5

Author: petk

cmake/CMakeLists.txt

@@ -12,6 +12,7 @@ include(cmake/Version.cmake)
 project(
   PHP
   VERSION ${PHP_VERSION}
+  #SPDX_LICENSE "PHP-3.01"
   DESCRIPTION "Widely-used general-purpose scripting language"
   HOMEPAGE_URL "https://www.php.net"
   LANGUAGES C

cmake/Zend/CMakeLists.txt

@@ -36,9 +36,11 @@ message(STATUS "")
 include(cmake/Version.cmake)
 
 project(
-  Zend
-  VERSION ${Zend_VERSION}
+  PHP_ZEND
+  VERSION ${PHP_ZEND_VERSION}
+  #SPDX_LICENSE "Zend-2.0"
   DESCRIPTION "Zend Engine library"
+  HOMEPAGE_URL "https://www.php.net"
   LANGUAGES C
 )
 
@@ -347,9 +349,9 @@ target_compile_definitions(
 set_target_properties(
   zend
   PROPERTIES
-    VERSION ${Zend_VERSION}
-    ZEND_EXTENSION_API_NO ${Zend_VERSION_EXTENSION_API_NO}
-    ZEND_MODULE_API_NO ${Zend_VERSION_MODULE_API_NO}
+    VERSION ${PHP_ZEND_VERSION}
+    ZEND_EXTENSION_API_NO ${PHP_ZEND_VERSION_EXTENSION_API_NO}
+    ZEND_MODULE_API_NO ${PHP_ZEND_VERSION_MODULE_API_NO}
 )
 
 ################################################################################

cmake/Zend/cmake/Version.cmake

@@ -3,35 +3,35 @@ Set Zend Engine version variables from the php-src/Zend/*.h header files.
 
 Variables:
 
-* Zend_VERSION_EXTENSION_API_NO
-* Zend_VERSION_LABEL
-* Zend_VERSION_MODULE_API_NO
-* Zend_VERSION
+* PHP_ZEND_VERSION_EXTENSION_API_NO
+* PHP_ZEND_VERSION_LABEL
+* PHP_ZEND_VERSION_MODULE_API_NO
+* PHP_ZEND_VERSION
 #]=============================================================================]
 
 include_guard(GLOBAL)
 
 # Set Zend Engine version variables.
-block(PROPAGATE Zend_VERSION Zend_VERSION_LABEL)
+block(PROPAGATE PHP_ZEND_VERSION PHP_ZEND_VERSION_LABEL)
   file(
     STRINGS
     zend.h
     _
     REGEX "^[ \t]*#[ \t]*define[ \t]+ZEND_VERSION[ \t]+\"([0-9.]+)([^\"]*)"
   )
-  set(Zend_VERSION "${CMAKE_MATCH_1}")
-  set(Zend_VERSION_LABEL "${CMAKE_MATCH_2}")
+  set(PHP_ZEND_VERSION "${CMAKE_MATCH_1}")
+  set(PHP_ZEND_VERSION_LABEL "${CMAKE_MATCH_2}")
 endblock()
 
 # This is automatically executed with the project(Zend...) invocation.
 function(_zend_version_post_project)
-  if(DEFINED Zend_VERSION_MODULE_API_NO)
+  if(DEFINED PHP_ZEND_VERSION_MODULE_API_NO)
     return()
   endif()
 
   # Append extra version label suffix to version.
-  string(APPEND Zend_VERSION "${Zend_VERSION_LABEL}")
-  message(STATUS "Zend Engine version: ${Zend_VERSION}")
+  string(APPEND PHP_ZEND_VERSION "${PHP_ZEND_VERSION_LABEL}")
+  message(STATUS "Zend Engine version: ${PHP_ZEND_VERSION}")
 
   # Get extensions API number.
   file(
@@ -40,7 +40,7 @@ function(_zend_version_post_project)
     _
     REGEX "^[ \t]*#[ \t]*define[ \t]+ZEND_EXTENSION_API_NO[ \t]+([0-9]+)"
   )
-  set(Zend_VERSION_EXTENSION_API_NO "${CMAKE_MATCH_1}")
+  set(PHP_ZEND_VERSION_EXTENSION_API_NO "${CMAKE_MATCH_1}")
 
   # Get modules API number.
   file(
@@ -49,13 +49,13 @@ function(_zend_version_post_project)
     _
     REGEX "^[ \t]*#[ \t]*define[ \t]+ZEND_MODULE_API_NO[ \t]+([0-9]+)"
   )
-  set(Zend_VERSION_MODULE_API_NO "${CMAKE_MATCH_1}")
+  set(PHP_ZEND_VERSION_MODULE_API_NO "${CMAKE_MATCH_1}")
 
   return(
     PROPAGATE
-      Zend_VERSION
-      Zend_VERSION_EXTENSION_API_NO
-      Zend_VERSION_MODULE_API_NO
+      PHP_ZEND_VERSION
+      PHP_ZEND_VERSION_EXTENSION_API_NO
+      PHP_ZEND_VERSION_MODULE_API_NO
   )
 endfunction()
-variable_watch(Zend_DESCRIPTION _zend_version_post_project)
+variable_watch(PHP_ZEND_DESCRIPTION _zend_version_post_project)

cmake/ext/date/lib/CMakeLists.txt

@@ -31,8 +31,11 @@ endblock()
 
 project(
   timelib
-  LANGUAGES C
   VERSION ${timelib_VERSION}
+  #SPDX_LICENSE "MIT"
+  DESCRIPTION "Timezone and date/time library"
+  HOMEPAGE_URL "https://github.com/derickr/timelib"
+  LANGUAGES C
 )
 
 include(CheckCompilerFlag)