Add ZLIB with FetchContent

.github/workflows/ci.yaml

@@ -107,7 +107,6 @@ jobs:
             libsasl2-dev \
             libpq-dev \
             libmm-dev \
-            zlib1g-dev \
             libdmalloc-dev \
             dovecot-core \
             dovecot-pop3d \

cmake/cmake/Configuration.cmake

@@ -205,9 +205,6 @@ set(PHP_SQLITE_MIN_VERSION 3.7.7)
 # Minimum required version for the PostgreSQL dependency.
 set(PHP_POSTGRESQL_MIN_VERSION 9.1)
 
-# Minimum required version for the zlib dependency.
-set(PHP_ZLIB_MIN_VERSION 1.2.0.4)
-
 # Additional metadata for external packages to avoid duplication.
 set_package_properties(
   BZip2
@@ -251,13 +248,6 @@ set_package_properties(
     DESCRIPTION "SQL database engine library"
 )
 
-set_package_properties(
-  ZLIB
-  PROPERTIES
-    URL "https://zlib.net/"
-    DESCRIPTION "Compression library"
-)
-
 # Set base directory for ExternalProject CMake module.
 set_directory_properties(
   PROPERTIES EP_BASE ${PHP_BINARY_DIR}/CMakeFiles/PHP/ExternalProject

cmake/cmake/modules/PHP/Package/ZLIB.cmake

@@ -0,0 +1,99 @@
+#[=============================================================================[
+# PHP/Package/Zlib
+
+Finds or downloads the zlib library:
+
+```cmake
+include(PHP/Package/Zlib)
+```
+
+This module is a wrapper for finding the `ZLIB` library. It first tries to find
+the `ZLIB` library on the system. If not successful it tries to download it from
+the upstream source with `ExternalProject` module and builds it together with
+the PHP build.
+
+See: https://cmake.org/cmake/help/latest/module/FindZLIB.html
+
+## Examples
+
+```cmake
+include(PHP/Package/ZLIB)
+target_link_libraries(php_ext_foo PRIVATE ZLIB::ZLIB)
+#]=============================================================================]
+
+include(FeatureSummary)
+include(ExternalProject)
+
+set_package_properties(
+  ZLIB
+  PROPERTIES
+    URL "https://zlib.net/"
+    DESCRIPTION "Compression library"
+)
+
+# Minimum required version for the zlib dependency.
+set(PHP_ZLIB_MIN_VERSION 1.2.0.4)
+#set(PHP_ZLIB_MIN_VERSION 1.3.1)
+
+# Download version when system dependency is not found.
+set(PHP_ZLIB_DOWNLOAD_VERSION 1.3.1)
+
+if(TARGET ZLIB::ZLIB)
+  set(ZLIB_FOUND TRUE)
+  return()
+endif()
+
+find_package(ZLIB ${PHP_ZLIB_MIN_VERSION})
+
+if(NOT ZLIB_FOUND)
+  message(
+    STATUS
+    "ZLIB ${PHP_ZLIB_DOWNLOAD_VERSION} will be downloaded at build phase"
+  )
+
+  set(zlib_options "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>")
+
+  if(PHP_ZLIB_DOWNLOAD_VERSION VERSION_LESS_EQUAL 1.3.1)
+    list(APPEND zlib_options -DZLIB_BUILD_EXAMPLES=OFF)
+  endif()
+
+  if(PHP_ZLIB_DOWNLOAD_VERSION VERSION_GREATER 1.3.1)
+    list(APPEND zlib_options -DZLIB_BUILD_TESTING=OFF)
+  endif()
+
+  ExternalProject_Add(
+    ZLIB
+    STEP_TARGETS build install
+    URL
+      https://github.com/madler/zlib/releases/download/v${PHP_ZLIB_DOWNLOAD_VERSION}/zlib-${PHP_ZLIB_DOWNLOAD_VERSION}.tar.gz
+    CMAKE_ARGS ${zlib_options}
+    INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/zlib-installation
+    INSTALL_BYPRODUCTS <INSTALL_DIR>/lib/libz.so
+  )
+
+  # Move dependency to PACKAGES_FOUND.
+  block()
+    get_cmake_property(packagesNotFound PACKAGES_NOT_FOUND)
+    list(REMOVE_ITEM packagesNotFound ZLIB)
+    set_property(GLOBAL PROPERTY PACKAGES_NOT_FOUND packagesNotFound)
+    get_cmake_property(packagesFound PACKAGES_FOUND)
+    set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND ZLIB)
+  endblock()
+
+  ExternalProject_Get_Property(ZLIB INSTALL_DIR)
+
+  # Bypass issue with non-existing include directory for the imported target.
+  file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
+
+  add_library(ZLIB::ZLIB STATIC IMPORTED GLOBAL)
+  set_target_properties(
+    ZLIB::ZLIB
+    PROPERTIES
+      IMPORTED_LOCATION "${INSTALL_DIR}/lib/libz.${CMAKE_STATIC_LIBRARY_SUFFIX}"
+      INTERFACE_INCLUDE_DIRECTORIES "${INSTALL_DIR}/include"
+  )
+  add_dependencies(ZLIB::ZLIB ZLIB-install)
+
+  # Mark package as found.
+  set(ZLIB_FOUND TRUE)
+endif()

cmake/cmake/modules/Packages/LibXml2.cmake

@@ -54,6 +54,8 @@ FetchContent_Declare(
 find_package(LibXml2 ${PHP_LIBXML2_MIN_VERSION})
 
 if(NOT LibXml2_FOUND)
+  include(PHP/Package/ZLIB)
+
   set(FETCHCONTENT_QUIET NO)
   set(LIBXML2_WITH_PYTHON OFF)
   set(LIBXML2_WITH_LZMA OFF)

cmake/cmake/modules/Packages/PNG.cmake

@@ -0,0 +1,82 @@
+#[=============================================================================[
+Wrapper for finding the `PNG` library.
+
+Module first tries to find the `PNG` library on the system. If not
+successful it tries to download it from the upstream source with `FetchContent`
+module and build it together with the PHP build.
+
+See: https://cmake.org/cmake/help/latest/module/FindPNG.html
+
+The `FetchContent` CMake module does things differently compared to the
+`find_package()` flow:
+* By default, it uses `QUIET` in its `find_package()` call when calling the
+  `FetchContent_MakeAvailable()`;
+* When using `FeatureSummary`, dependencies must be moved manually to
+  `PACKAGES_FOUND` from the `PACKAGES_NOT_FOUND` global property;
+
+TODO: Improve this. This is for now only initial `FetchContent` integration for
+testing purposes and will be changed in the future.
+#]=============================================================================]
+
+include(FeatureSummary)
+include(FetchContent)
+
+set_package_properties(
+  PNG
+  PROPERTIES
+    URL "http://libpng.org"
+    DESCRIPTION "Portable Network Graphics (PNG image format) library"
+)
+
+# Minimum required version for the PNG dependency.
+#set(PHP_PNG_MIN_VERSION ?.?.??)
+
+# Download version when system dependency is not found.
+set(PHP_PNG_DOWNLOAD_VERSION 1.6.44)
+
+FetchContent_Declare(
+  PNG
+  URL https://download.sourceforge.net/libpng/libpng-${PHP_PNG_DOWNLOAD_VERSION}.tar.gz
+  EXCLUDE_FROM_ALL
+  SYSTEM
+  FIND_PACKAGE_ARGS
+)
+
+find_package(PNG ${PHP_PNG_MIN_VERSION})
+
+if(NOT PNG_FOUND)
+  include(Packages/ZLIB)
+
+  set(FETCHCONTENT_QUIET NO)
+
+  # The above EXCLUDE_FROM_ALL was introduced in CMake 3.28.
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.28)
+    FetchContent_MakeAvailable(PNG)
+  else()
+    FetchContent_GetProperties(PNG)
+    if(NOT PNG_POPULATED)
+      FetchContent_Populate(PNG)
+
+      add_subdirectory(
+        ${PNG_SOURCE_DIR}
+        ${PNG_BINARY_DIR}
+        EXCLUDE_FROM_ALL
+      )
+    endif()
+  endif()
+
+  # Move dependency to PACKAGES_FOUND.
+  block()
+    get_cmake_property(packagesNotFound PACKAGES_NOT_FOUND)
+    list(REMOVE_ITEM packagesNotFound PNG)
+    set_property(GLOBAL PROPERTY PACKAGES_NOT_FOUND packagesNotFound)
+    get_cmake_property(packagesFound PACKAGES_FOUND)
+    set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND PNG)
+  endblock()
+
+  # Mark package as found.
+  set(PNG_FOUND TRUE)
+
+  # Clean used variables.
+  unset(FETCHCONTENT_QUIET)
+endif()

cmake/cmake/modules/Packages/libzip.cmake

@@ -0,0 +1,83 @@
+#[=============================================================================[
+Wrapper for finding the `libzip` library.
+
+Module first tries to find the `libzip` library on the system. If not
+successful it tries to download it from the upstream source with `FetchContent`
+module and build it together with the PHP build.
+
+The `FetchContent` CMake module does things differently compared to the
+`find_package()` flow:
+* By default, it uses `QUIET` in its `find_package()` call when calling the
+  `FetchContent_MakeAvailable()`;
+* When using `FeatureSummary`, dependencies must be moved manually to
+  `PACKAGES_FOUND` from the `PACKAGES_NOT_FOUND` global property;
+
+TODO: Improve this. This is for now only initial `FetchContent` integration for
+testing purposes and will be changed in the future.
+#]=============================================================================]
+
+include(FeatureSummary)
+include(FetchContent)
+
+set_package_properties(
+  libzip
+  PROPERTIES
+    URL "https://libzip.org/"
+    DESCRIPTION "Library for reading and writing ZIP compressed archives"
+)
+
+# Minimum required version for the libzip dependency.
+set(PHP_libzip_MIN_VERSION 1.7.1)
+
+# Download version when system dependency is not found.
+set(PHP_libzip_DOWNLOAD_VERSION 1.11.2)
+
+FetchContent_Declare(
+  libzip
+  URL https://github.com/nih-at/libzip/releases/download/v${PHP_libzip_DOWNLOAD_VERSION}/libzip-${PHP_libzip_DOWNLOAD_VERSION}.tar.gz
+  EXCLUDE_FROM_ALL
+  SYSTEM
+  FIND_PACKAGE_ARGS
+)
+
+find_package(libzip ${PHP_libzip_MIN_VERSION})
+
+if(NOT libzip_FOUND)
+  include(Packages/ZLIB)
+
+  set(FETCHCONTENT_QUIET NO)
+
+  # The above EXCLUDE_FROM_ALL was introduced in CMake 3.28.
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.28)
+    FetchContent_MakeAvailable(libzip)
+  else()
+    FetchContent_GetProperties(libzip)
+    if(NOT libzip_POPULATED)
+      FetchContent_Populate(libzip)
+
+      add_subdirectory(
+        ${libzip_SOURCE_DIR}
+        ${libzip_BINARY_DIR}
+        EXCLUDE_FROM_ALL
+      )
+    endif()
+  endif()
+
+  # Move dependency to PACKAGES_FOUND.
+  block()
+    get_cmake_property(packagesNotFound PACKAGES_NOT_FOUND)
+    list(REMOVE_ITEM packagesNotFound libzip)
+    set_property(GLOBAL PROPERTY PACKAGES_NOT_FOUND packagesNotFound)
+    get_cmake_property(packagesFound PACKAGES_FOUND)
+    set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND libzip)
+  endblock()
+
+  add_library(libzip::libzip INTERFACE IMPORTED GLOBAL)
+  target_link_libraries(libzip::libzip INTERFACE zip)
+
+  # Mark package as found.
+  set(libzip_FOUND TRUE)
+
+  # Clean used variables.
+  unset(FETCHCONTENT_QUIET)
+endif()

cmake/ext/gd/CMakeLists.txt

@@ -316,7 +316,7 @@ if(NOT PHP_EXT_GD_EXTERNAL)
     )
   endif()
 
-  find_package(ZLIB ${PHP_ZLIB_MIN_VERSION})
+  include(PHP/Package/ZLIB)
   set_package_properties(
     ZLIB
     PROPERTIES
@@ -326,7 +326,7 @@ if(NOT PHP_EXT_GD_EXTERNAL)
 
   target_link_libraries(php_ext_gd PRIVATE ZLIB::ZLIB)
 
-  find_package(PNG)
+  include(Packages/PNG)
   set_package_properties(
     PNG
     PROPERTIES

cmake/ext/mysqlnd/CMakeLists.txt

@@ -170,7 +170,7 @@ target_link_libraries(
 )
 
 if(PHP_EXT_MYSQLND_COMPRESSION)
-  find_package(ZLIB ${PHP_ZLIB_MIN_VERSION})
+  include(PHP/Package/ZLIB)
   set_package_properties(
     ZLIB
     PROPERTIES

cmake/ext/standard/CMakeLists.txt

@@ -22,6 +22,9 @@ Use external crypt library, such as libcrypt or libxcrypt, instead of the
 bundled PHP crypt.
 #]=============================================================================]
 
+# TODO: ext/standard/image.c depends on zlib extension and its macros but it
+# should only depend on zlib library.
+
 project(
   PhpExtensionStandard
   LANGUAGES C

cmake/ext/zip/CMakeLists.txt

@@ -68,7 +68,7 @@ target_sources(
 
 add_dependencies(php_ext_zip php_ext_pcre)
 
-find_package(libzip 1.7.1)
+include(Packages/libzip)
 set_package_properties(
   libzip
   PROPERTIES

cmake/ext/zlib/CMakeLists.txt

@@ -77,15 +77,24 @@ endif()
 
 target_compile_definitions(php_ext_zlib PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
-find_package(ZLIB ${PHP_ZLIB_MIN_VERSION})
+include(PHP/Package/ZLIB)
 set_package_properties(
   ZLIB
   PROPERTIES
     TYPE REQUIRED
     PURPOSE "Necessary to enable the zlib extension."
 )
 
-target_link_libraries(php_ext_zlib PRIVATE ZLIB::ZLIB)
+# Link publicly for internal_functions files and ext/standard/image.c.
+target_link_libraries(php_ext_zlib PUBLIC ZLIB::ZLIB)
+
+# TODO: zlib.h must exist when building php_main* targets.
+add_dependencies(
+  php_ext_zlib
+  php_main
+  php_main_internal_functions
+  php_main_internal_functions_cli
+)
 
 set(HAVE_ZLIB TRUE)