Add initial Conan configuration

petk · petk · commit 6f185d85fc0e · 2025-07-19T21:15:04.000+02:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -56,8 +56,12 @@ jobs:
         run: |
           sudo apt-get -y install \
             build-essential \
+            re2c \
+            bison \
+            libxml2-dev \
             libssl-dev \
             libpcre2-dev \
+            libsqlite3-dev \
             libbz2-dev \
             libcurl4-openssl-dev \
             libdb5.3++-dev \
@@ -71,6 +75,7 @@ jobs:
             firebird-dev \
             libsodium-dev \
             libicu-dev \
+            libzip-dev \
             aspell \
             libaspell-dev \
             libavif-dev \
@@ -79,6 +84,7 @@ jobs:
             libpng-dev \
             libwebp-dev \
             libxpm-dev \
+            libonig-dev \
             libtidy-dev \
             libargon2-dev \
             libxslt1-dev \
@@ -101,6 +107,7 @@ jobs:
             libsasl2-dev \
             libpq-dev \
             libmm-dev \
+            zlib1g-dev \
             libdmalloc-dev \
             dovecot-core \
             dovecot-pop3d \
@@ -135,6 +142,137 @@ jobs:
       - name: Install PHP
         run: cmake --install php-build/all-enabled
 
+  linux-externalproject-module:
+    runs-on: ubuntu-latest
+    name: Downloading dependencies with ExternalProject module on Linux
+    steps:
+      - name: Install base dependencies
+        run: |
+          sudo apt-get -y install \
+            build-essential \
+            libssl-dev \
+            libpcre2-dev \
+            libbz2-dev \
+            libcurl4-openssl-dev \
+            libdb5.3++-dev \
+            libenchant-2-dev \
+            libgmp-dev \
+            libc-client-dev \
+            libkrb5-dev \
+            unixodbc-dev \
+            freetds-dev \
+            apache2-dev \
+            firebird-dev \
+            libsodium-dev \
+            libicu-dev \
+            libzip-dev \
+            aspell \
+            libaspell-dev \
+            libavif-dev \
+            libfreetype-dev \
+            libjpeg-dev \
+            libwebp-dev \
+            libxpm-dev \
+            libtidy-dev \
+            libargon2-dev \
+            libxslt1-dev \
+            libcapstone-dev \
+            libedit-dev \
+            libcdb-dev \
+            liblmdb-dev \
+            libqdbm-dev \
+            libtokyocabinet-dev \
+            libsnmp-dev \
+            snmp \
+            snmpd \
+            snmp-mibs-downloader \
+            libexpat1-dev \
+            libacl1-dev \
+            libapparmor-dev \
+            libselinux1-dev \
+            libsystemd-dev \
+            libldap2-dev \
+            libsasl2-dev \
+            libpq-dev \
+            libmm-dev \
+            libdmalloc-dev \
+            dovecot-core \
+            dovecot-pop3d \
+            dovecot-imapd \
+            sendmail;
+
+      - name: Install CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Build and install
+        run: |
+          cmake --preset all-enabled
+          cmake --build --preset all-enabled -j
+
+  linux-conan:
+    runs-on: ubuntu-latest
+    name: Downloading dependencies with Conan on Linux
+    steps:
+      - name: Install packages
+        run: |
+          sudo apt-get -y install \
+            build-essential \
+            freetds-dev \
+            apache2-dev \
+            firebird-dev \
+            libc-client-dev \
+            aspell \
+            libaspell-dev \
+            libcdb-dev \
+            libtokyocabinet-dev \
+            libsnmp-dev \
+            libacl1-dev \
+            libedit-dev \
+            snmp \
+            snmpd \
+            snmp-mibs-downloader \
+            libapparmor-dev \
+            libpq-dev \
+            libmm-dev \
+            libsystemd-dev \
+            libwebp-dev \
+            libxpm-dev \
+            libzip-dev \
+            liblmdb-dev \
+            libonig-dev \
+            libldap2-dev \
+            libtidy-dev \
+            libdmalloc-dev \
+            dovecot-core \
+            dovecot-pop3d \
+            dovecot-imapd \
+            sendmail;
+
+      - name: Install CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Install Conan
+        uses: conan-io/setup-conan@v1
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Install dependencies with Conan
+        run: |
+          conan install . --output-folder=php-build-conan --build=missing --profile:build=default --profile:host=default
+
+      - name: Build and install
+        run: |
+          cmake --preset conan
+          cmake --build --preset conan -j
+
   windows:
     runs-on: windows-latest
     name: Windows
diff --git a/cmake/CMakePresets.json b/cmake/CMakePresets.json
@@ -3,6 +3,7 @@
   "include": [
     "cmake/presets/all-disabled.json",
     "cmake/presets/all-enabled.json",
+    "cmake/presets/conan.json",
     "cmake/presets/windows.json"
   ],
   "configurePresets": [
diff --git a/cmake/cmake/modules/PHP/Package/LibXml2.cmake b/cmake/cmake/modules/PHP/Package/LibXml2.cmake
@@ -39,7 +39,7 @@ set_package_properties(
 set(PHP_LIBXML2_MIN_VERSION 2.9.0)
 
 # Download version when system dependency is not found.
-set(PHP_LIBXML2_DOWNLOAD_VERSION 2.14.4)
+set(PHP_LIBXML2_DOWNLOAD_VERSION 2.14.5)
 
 macro(php_package_libxml2_find)
   if(TARGET LibXml2::LibXml2)
@@ -83,10 +83,12 @@ macro(_php_package_libxml2_download)
     list(APPEND options "-DZLIB_ROOT=${INSTALL_DIR}")
   endif()
 
-  # LibXml2 has hardcoded dl library check, while, for example, on Haiku
-  # dlopen is in root library.
+  # LibXml2 had hardcoded dl library check in versions <= 2.14.5.
   # https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/331
-  if(CMAKE_SYSTEM_NAME STREQUAL "Haiku")
+  if(
+    CMAKE_SYSTEM_NAME STREQUAL "Haiku"
+    AND PHP_LIBXML2_DOWNLOAD_VERSION VERSION_LESS_EQUAL 2.14.5
+  )
     list(APPEND options "-DLIBXML2_WITH_MODULES=OFF")
   endif()
 
diff --git a/cmake/cmake/modules/PHP/Package/Oniguruma.cmake b/cmake/cmake/modules/PHP/Package/Oniguruma.cmake
@@ -7,11 +7,10 @@ Finds or downloads the Oniguruma library:
 include(PHP/Package/Oniguruma)
 ```
 
-Wrapper for finding the `Oniguruma` library.
-
-Module first tries to find the `Oniguruma` library on the system. If not
-successful it tries to download it from the upstream source and builds it
-together with the PHP build.
+This module first tries to find the `Oniguruma` library on the system. If not
+successful it downloads it from the upstream source during the main project
+configuration phase and then configures and builds it during the main project's
+build phase.
 
 ## Examples
 
@@ -25,39 +24,32 @@ target_link_libraries(php_ext_foo PRIVATE Oniguruma::Oniguruma)
 
 include(ExternalProject)
 include(FeatureSummary)
+include(FetchContent)
 
 # Minimum required version for the Oniguruma dependency.
-#set(PHP_ONIGURUMA_MIN_VERSION ?.?.??)
+set(PHP_ONIGURUMA_MIN_VERSION 5.9.6) # This is the 1st tag available on GitHub.
 
 # Download version when system dependency is not found.
 set(PHP_ONIGURUMA_DOWNLOAD_VERSION 6.9.10)
 
-macro(php_package_oniguruma_find)
-  if(TARGET Oniguruma::Oniguruma)
-    set(Oniguruma_FOUND TRUE)
-    get_property(Oniguruma_DOWNLOADED GLOBAL PROPERTY _PHP_Oniguruma_DOWNLOADED)
-    set(PHP_ONIG_KOI8 FALSE)
-  else()
-    find_package(Oniguruma ${PHP_ONIGURUMA_MIN_VERSION})
-
-    if(NOT Oniguruma_FOUND)
-      _php_package_oniguruma_download()
-    endif()
-  endif()
-endmacro()
-
-macro(_php_package_oniguruma_download)
-  message(STATUS "Downloading Oniguruma ${PHP_ONIGURUMA_DOWNLOAD_VERSION}")
-
+macro(php_package_oniguruma)
   FetchContent_Declare(
     Oniguruma
     URL https://github.com/petk/oniguruma/archive/refs/tags/v${PHP_ONIGURUMA_DOWNLOAD_VERSION}.tar.gz
     SOURCE_SUBDIR non-existing
-    OVERRIDE_FIND_PACKAGE
+    FIND_PACKAGE_ARGS ${PHP_ONIGURUMA_MIN_VERSION}
   )
 
+  #find_package(Oniguruma ${PHP_ONIGURUMA_MIN_VERSION})
+
   FetchContent_MakeAvailable(Oniguruma)
 
+  if(NOT Oniguruma_FOUND)
+    _php_package_oniguruma_init()
+  endif()
+endmacro()
+
+macro(_php_package_oniguruma_init)
   set(options "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>")
 
   list(
@@ -106,9 +98,6 @@ macro(_php_package_oniguruma_download)
     endif()
   endblock()
 
-  # Mark package as found.
-  set(Oniguruma_FOUND TRUE)
-
   define_property(
     GLOBAL
     PROPERTY _PHP_Oniguruma_DOWNLOADED
@@ -121,4 +110,21 @@ macro(_php_package_oniguruma_download)
   set(PHP_ONIG_KOI8 FALSE)
 endmacro()
 
-php_package_oniguruma_find()
+php_package_oniguruma()
+
+macro(php_package_oniguruma_find)
+  if(TARGET Oniguruma::Oniguruma)
+    get_property(Oniguruma_DOWNLOADED GLOBAL PROPERTY _PHP_Oniguruma_DOWNLOADED)
+    set(PHP_ONIG_KOI8 FALSE)
+  else()
+    find_package(Oniguruma ${PHP_ONIGURUMA_MIN_VERSION})
+
+    if(NOT Oniguruma_FOUND)
+      _php_package_oniguruma_download()
+    endif()
+  endif()
+endmacro()
+
+macro(_php_package_oniguruma_download)
+  message(STATUS "Downloading Oniguruma ${PHP_ONIGURUMA_DOWNLOAD_VERSION}")
+endmacro()
diff --git a/cmake/cmake/presets/conan.json b/cmake/cmake/presets/conan.json
diff --git a/cmake/conanfile.txt b/cmake/conanfile.txt
