Merge branch 'PHP-8.4'

Author: petk

Diff for: cmake/ext/CMakeLists.txt

@@ -1,6 +1,11 @@
 #[=============================================================================[
 Add subdirectories of PHP extensions.
 
+## INTERFACE target
+
+* `php_extensions` (alias `PHP::extensions`) is an INTERFACE library with all
+  enabled extensions linked into for convenience.
+
 ## Custom CMake properties
 
 * `PHP_ALL_EXTENSIONS`
@@ -67,20 +72,60 @@ set_property(GLOBAL PROPERTY PHP_ALL_EXTENSIONS ${extensions})
 # Sort and preconfigure extensions by their dependencies.
 php_extensions_preprocess(extensions)
 
+add_library(php_extensions INTERFACE)
+add_library(PHP::extensions ALIAS php_extensions)
+
 # Add subdirectories of extensions.
 foreach(extension IN LISTS extensions)
   list(APPEND CMAKE_MESSAGE_CONTEXT "${extension}")
+  message(CHECK_START "Configuring extension ${extension}")
+  list(APPEND CMAKE_MESSAGE_INDENT "  ")
 
-  message(STATUS "Checking extension ${extension}")
   add_subdirectory("${extension}")
 
   php_extensions_postconfigure("${extension}")
 
-  list(POP_BACK CMAKE_MESSAGE_CONTEXT)
-
+  list(POP_BACK CMAKE_MESSAGE_INDENT)
   if(TARGET php_${extension})
     set_property(GLOBAL APPEND PROPERTY PHP_EXTENSIONS ${extension})
+
+    # Add extension's PUBLIC/INTERFACE compile options to configuration.
+    # Cleaner COMPILE_ONLY generator expression is available in CMake >= 3.27.
+    if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.27)
+      target_link_libraries(
+        php_configuration
+        INTERFACE
+          $<COMPILE_ONLY:PHP::${extension}>
+      )
+    else()
+      target_include_directories(
+        php_configuration
+        INTERFACE
+          $<TARGET_PROPERTY:PHP::${extension},INTERFACE_INCLUDE_DIRECTORIES>
+      )
+    endif()
+
+    target_link_libraries(php_${extension} PRIVATE PHP::configuration)
+
+    # Add configuration compile options before the extension compile options.
+    target_compile_options(
+      php_${extension}
+      BEFORE PRIVATE
+        $<TARGET_PROPERTY:php_configuration,INTERFACE_COMPILE_OPTIONS>
+    )
+
+    add_dependencies(php_${extension} zend)
+
+    get_target_property(type php_${extension} TYPE)
+    if(NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$")
+      target_link_libraries(php_extensions INTERFACE PHP::${extension})
+    endif()
+
+    message(CHECK_PASS "enabled")
+  else()
+    message(CHECK_FAIL "disabled")
   endif()
+  list(POP_BACK CMAKE_MESSAGE_CONTEXT)
 endforeach()
 
 get_cmake_property(extensions PHP_EXTENSIONS)

Diff for: cmake/ext/odbc/CMakeLists.txt

@@ -60,7 +60,7 @@ if(EXT_ODBC AND EXT_PDO_ODBC AND NOT EXT_ODBC_TYPE STREQUAL EXT_PDO_ODBC_TYPE)
   )
 endif()
 
-# Some ODBC drivers require setting ODBC_LIBRARY manually to find package.
+# Some ODBC drivers require setting ODBC_LIBRARY manually to be found.
 if(
   EXT_ODBC
   AND NOT EXT_ODBC_TYPE MATCHES "auto|unixODBC|iODBC"
@@ -120,12 +120,6 @@ target_sources(
 
 target_compile_definitions(php_odbc PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
-# TODO: Can this be fixed better?
-get_target_property(extension_type php_odbc TYPE)
-if(NOT extension_type MATCHES "^(MODULE|SHARED)_LIBRARY$")
-  target_link_libraries(php_odbc PRIVATE PHP::main)
-endif()
-
 if(NOT EXT_ODBC_TYPE STREQUAL "auto")
   set(ODBC_USE_DRIVER "${EXT_ODBC_TYPE}")
 endif()
@@ -137,48 +131,65 @@ set_package_properties(
     PURPOSE "Necessary to enable the odbc extension."
 )
 
-if(ODBC_DRIVER AND EXT_ODBC_TYPE STREQUAL "auto")
-  set(EXT_ODBC_TYPE "${ODBC_DRIVER}")
+target_link_libraries(php_odbc PRIVATE ODBC::ODBC)
+
+# Sanity checks.
+if(EXT_ODBC_TYPE STREQUAL "ibm-db2" AND TARGET ODBC::ODBC)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_LIBRARIES ODBC::ODBC)
+    check_include_file(sqlcli1.h HAVE_SQLCLI1_H)
+    check_library_exists(ODBC::ODBC "" SQLExecute HAVE_SQLEXECUTE)
+  cmake_pop_check_state()
+  if(NOT HAVE_SQLCLI1_H)
+    message(FATAL_ERROR "Required <sqlcli1.h> header file not found")
+  endif()
+  if(NOT HAVE_SQLEXECUTE)
+    message(
+      FATAL_ERROR
+      "ODBC build test failed. SQLExecute not found. The DB2 environment "
+      "needs to be sourced. Run the command line:\n"
+      "  . $IBM_DB2/db2profile"
+    )
+  endif()
 endif()
 
-target_link_libraries(php_odbc PRIVATE ODBC::ODBC)
+################################################################################
+# Set variables for main/build-defs.h and config.h file.
+################################################################################
+
+# Set PHP_ODBC_TYPE for configuration header value.
+if(ODBC_DRIVER STREQUAL "Windows")
+  set(PHP_ODBC_TYPE "Win32")
+elseif(
+  (ODBC_DRIVER STREQUAL "iODBC" AND EXT_ODBC_TYPE STREQUAL "auto")
+  OR EXT_ODBC_TYPE STREQUAL "iODBC"
+)
+  # To match the native build system string:
+  set(PHP_ODBC_TYPE "iodbc")
+elseif(ODBC_DRIVER AND EXT_ODBC_TYPE STREQUAL "auto")
+  set(PHP_ODBC_TYPE "${ODBC_DRIVER}")
+elseif(EXT_ODBC_TYPE STREQUAL "custom")
+  # To match the native build system string:
+  set(PHP_ODBC_TYPE custom-odbc)
+else()
+  set(PHP_ODBC_TYPE "${EXT_ODBC_TYPE}")
+endif()
 
-if(EXT_ODBC_TYPE STREQUAL "adabas")
+if(PHP_ODBC_TYPE STREQUAL "adabas")
   set(HAVE_ADABAS 1)
-elseif(EXT_ODBC_TYPE STREQUAL "dbmaker")
+elseif(PHP_ODBC_TYPE STREQUAL "dbmaker")
   set(HAVE_DBMAKER 1)
-elseif(EXT_ODBC_TYPE MATCHES "^(empress|empress-bcs)$")
+elseif(PHP_ODBC_TYPE MATCHES "^(empress|empress-bcs)$")
   set(HAVE_EMPRESS 1)
-elseif(EXT_ODBC_TYPE STREQUAL "esoob")
+elseif(PHP_ODBC_TYPE STREQUAL "esoob")
   set(HAVE_ESOOB 1)
-elseif(EXT_ODBC_TYPE STREQUAL "ibm-db2")
-  # Sanity check.
-  if(TARGET ODBC::ODBC)
-    cmake_push_check_state(RESET)
-      set(CMAKE_REQUIRED_LIBRARIES ODBC::ODBC)
-      check_include_file(sqlcli1.h HAVE_SQLCLI1_H)
-      check_library_exists(ODBC::ODBC "" SQLExecute HAVE_SQLEXECUTE)
-    cmake_pop_check_state()
-    if(NOT HAVE_SQLCLI1_H)
-      message(FATAL_ERROR "Required <sqlcli1.h> header file not found")
-    endif()
-    if(NOT HAVE_SQLEXECUTE)
-      message(
-        FATAL_ERROR
-        "ODBC build test failed. SQLExecute not found. The DB2 environment "
-        "needs to be sourced. Run the command line:\n"
-        "  . $IBM_DB2/db2profile"
-      )
-    endif()
-  endif()
+elseif(PHP_ODBC_TYPE STREQUAL "ibm-db2")
   set(HAVE_IBMDB2 1)
-elseif(EXT_ODBC_TYPE STREQUAL "iODBC")
+elseif(PHP_ODBC_TYPE STREQUAL "iodbc")
   set(HAVE_IODBC 1)
-  # To match the native build system string:
-  set(EXT_ODBC_TYPE iodbc)
-elseif(EXT_ODBC_TYPE STREQUAL "sapdb")
+elseif(PHP_ODBC_TYPE STREQUAL "sapdb")
   set(HAVE_SAPDB 1)
-elseif(EXT_ODBC_TYPE STREQUAL "solid")
+elseif(PHP_ODBC_TYPE STREQUAL "solid")
   # Set based on the Solid version:
   if(ODBC_LIBRARY MATCHES "23\.(a|so)$")
     set(HAVE_SOLID 1)
@@ -195,21 +206,16 @@ elseif(EXT_ODBC_TYPE STREQUAL "solid")
   elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     set(SS_FBX 1)
   endif()
-elseif(EXT_ODBC_TYPE STREQUAL "unixODBC")
+elseif(PHP_ODBC_TYPE STREQUAL "unixODBC")
   set(HAVE_UNIXODBC 1)
-elseif(EXT_ODBC_TYPE STREQUAL "custom")
+elseif(PHP_ODBC_TYPE STREQUAL "custom-odbc")
   set(HAVE_CODBC 1)
-  # To match the native build system string:
-  set(EXT_ODBC_TYPE custom-odbc)
 endif()
 
 if(NOT EXT_ODBC_TYPE MATCHES "^(dbmaker|solid)$")
   set(HAVE_SQLDATASOURCES 1)
 endif()
 
-################################################################################
-# Set ODBC_* variables for main/build-defs.h file.
-################################################################################
 if(TARGET ODBC::ODBC)
   block(PROPAGATE PHP_ODBC_BUILD_DEFINITIONS_CODE)
     get_target_property(definitions ODBC::ODBC INTERFACE_COMPILE_DEFINITIONS)
@@ -249,11 +255,10 @@ if(TARGET ODBC::ODBC)
     set(PHP_ODBC_CFLAGS "${cflags}" CACHE INTERNAL "ODBC CFLAGS")
     set(PHP_ODBC_LFLAGS "${ldflags}" CACHE INTERNAL "ODBC linker flags")
     set(PHP_ODBC_LIBS "${libs}" CACHE INTERNAL "ODBC libraries")
-    set(PHP_ODBC_TYPE "${EXT_ODBC_TYPE}" CACHE INTERNAL "ODBC type")
+    set(PHP_ODBC_TYPE "${PHP_ODBC_TYPE}" CACHE INTERNAL "ODBC type")
 
     if(
-      NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"
-      AND NOT PHP_SOURCE_DIR
+      NOT ODBC_DRIVER STREQUAL "Windows"
       AND NOT EXISTS ${PHP_SOURCE_DIR}/main/build-defs.h.in
     )
       set(

Diff for: cmake/ext/pdo_odbc/CMakeLists.txt

@@ -36,7 +36,7 @@ php_set(
 )
 mark_as_advanced(EXT_PDO_ODBC_TYPE)
 
-# Some ODBC drivers require setting ODBC_LIBRARY manually to find package.
+# Some ODBC drivers require setting ODBC_LIBRARY manually to be found.
 if(
   EXT_PDO_ODBC
   AND NOT EXT_PDO_ODBC_TYPE MATCHES "auto|unixODBC|iODBC"
@@ -71,12 +71,6 @@ target_sources(
 
 add_dependencies(php_pdo_odbc php_pdo)
 
-# TODO: Can this be fixed better?
-get_target_property(extension_type php_pdo_odbc TYPE)
-if(NOT extension_type MATCHES "^(MODULE|SHARED)_LIBRARY$")
-  target_link_libraries(php_pdo_odbc PRIVATE PHP::main)
-endif()
-
 if(NOT EXT_PDO_ODBC_TYPE STREQUAL "auto")
   set(ODBC_USE_DRIVER "${EXT_PDO_ODBC_TYPE}")
 endif()
@@ -87,18 +81,21 @@ set_package_properties(
     TYPE REQUIRED
     PURPOSE "Necessary to enable the pdo_odbc extension."
 )
-if(ODBC_DRIVER AND EXT_PDO_ODBC_TYPE STREQUAL "auto")
-  set(EXT_PDO_ODBC_TYPE "${ODBC_DRIVER}")
-endif()
 
-if(EXT_PDO_ODBC_TYPE STREQUAL "custom")
+if(ODBC_DRIVER STREQUAL "Windows")
+  set(PDO_ODBC_TYPE "Win32")
+elseif(ODBC_DRIVER AND EXT_PDO_ODBC_TYPE STREQUAL "auto")
+  set(PDO_ODBC_TYPE "${ODBC_DRIVER}")
+elseif(EXT_PDO_ODBC_TYPE STREQUAL "custom")
   set(PDO_ODBC_TYPE "generic-${ODBC_LIBRARY}")
 else()
   set(PDO_ODBC_TYPE "${EXT_PDO_ODBC_TYPE}")
 endif()
 
 if(TARGET ODBC::ODBC)
   block()
+    set(haveSomeHeaders)
+
     foreach(
       header
       IN ITEMS
@@ -126,19 +123,18 @@ if(TARGET ODBC::ODBC)
       message(CHECK_START "Looking for ${header}")
       if(EXISTS ${ODBC_INCLUDE_DIR}/${header})
         message(CHECK_PASS "found")
-        set(${const} 1)
+        set(haveSomeHeaders TRUE)
         set(${const} 1 PARENT_SCOPE)
       else()
         message(CHECK_FAIL "not found")
       endif()
-
-      if(${const})
-        set(haveSomeHeaders TRUE)
-      endif()
     endforeach()
 
     if(NOT haveSomeHeaders)
-      message(FATAL_ERROR "Cannot find header file(s) for pdo_odbc")
+      message(
+        FATAL_ERROR
+        "Could not found any of the ODBC header files to build pdo_odbc extension"
+      )
     endif()
   endblock()
 

Diff for: cmake/ext/random/CMakeLists.txt

@@ -54,7 +54,4 @@ block()
   check_include_files("${headers}" HAVE_COMMONCRYPTO_COMMONRANDOM_H)
 endblock()
 
-# TODO: Fix this better with object libraries in the future.
-target_link_libraries(php_random PRIVATE Zend::Zend)
-
 configure_file(config.cmake.h.in config.h)

Diff for: cmake/ext/standard/CMakeLists.txt

@@ -199,8 +199,6 @@ target_link_libraries(
   php_standard
   PRIVATE
     $<$<PLATFORM_ID:Windows>:iphlpapi>
-    # TODO: Can this be fixed better?
-    PHP::main
 )
 
 ################################################################################