Skip to content

Commit 6391c2b

Browse files
committed
Simplify conan config
1 parent b07f66c commit 6391c2b

File tree

2 files changed

+6
-77
lines changed

2 files changed

+6
-77
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ jobs:
7676
firebird-dev \
7777
libsodium-dev \
7878
libicu-dev \
79-
libzip-dev \
8079
aspell \
8180
libaspell-dev \
8281
libavif-dev \
@@ -245,7 +244,6 @@ jobs:
245244
libsystemd-dev \
246245
libwebp-dev \
247246
libxpm-dev \
248-
libzip-dev \
249247
liblmdb-dev \
250248
libonig-dev \
251249
libldap2-dev \
@@ -269,7 +267,7 @@ jobs:
269267

270268
- name: Install dependencies with Conan
271269
run: |
272-
conan install . --output-folder=php-build-conan --build=missing --profile:build=default --profile:host=default
270+
conan install cmake --output-folder=php-build/php --build=missing --profile:build=default --profile:host=default
273271
274272
- name: Build and install
275273
run: |

cmake/cmake/presets/conan.json

Lines changed: 5 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,17 @@
11
{
22
"version": 4,
3+
"include": [
4+
"all-enabled.json"
5+
],
36
"configurePresets": [
47
{
58
"name": "conan",
9+
"inherits": "all-enabled",
610
"displayName": "All extensions enabled",
711
"description": "PHP configuration with all PHP extensions and SAPIs enabled",
812
"binaryDir": "${sourceDir}/php-build",
913
"installDir": "/tmp",
10-
"toolchainFile": "${sourceDir}/php-build/build/Release/generators/conan_toolchain.cmake",
11-
"cacheVariables": {
12-
"PHP_PEAR": true,
13-
14-
"PHP_EXT_BCMATH": true,
15-
"PHP_EXT_BZ2": true,
16-
"PHP_EXT_CALENDAR": true,
17-
"PHP_EXT_CURL": true,
18-
"PHP_EXT_DBA": true,
19-
"PHP_EXT_DBA_LMDB": true,
20-
"PHP_EXT_DBA_QDBM": true,
21-
"PHP_EXT_DBA_TCADB": true,
22-
"PHP_EXT_DL_TEST": true,
23-
"PHP_EXT_ENCHANT": true,
24-
"PHP_EXT_EXIF": true,
25-
"PHP_EXT_FFI": true,
26-
"PHP_EXT_FTP": true,
27-
"PHP_EXT_GD": true,
28-
"PHP_EXT_GD_AVIF": true,
29-
"PHP_EXT_GD_WEBP": true,
30-
"PHP_EXT_GD_JPEG": true,
31-
"PHP_EXT_GD_XPM": true,
32-
"PHP_EXT_GD_FREETYPE": true,
33-
"PHP_EXT_GD_JIS": true,
34-
"PHP_EXT_GETTEXT": true,
35-
"PHP_EXT_GMP": true,
36-
"PHP_EXT_HASH_MHASH": true,
37-
"PHP_EXT_IMAP": true,
38-
"PHP_EXT_IMAP_KERBEROS": true,
39-
"PHP_EXT_IMAP_SSL": true,
40-
"PHP_EXT_INTL": true,
41-
"PHP_EXT_LDAP": true,
42-
"PHP_EXT_LDAP_SASL": true,
43-
"PHP_EXT_MBSTRING": true,
44-
"PHP_EXT_MYSQLI": true,
45-
"PHP_EXT_MYSQL_SOCKET": true,
46-
"PHP_EXT_MYSQLND": true,
47-
"PHP_EXT_ODBC": true,
48-
"PHP_EXT_OPCACHE_CAPSTONE": true,
49-
"PHP_EXT_OPENSSL": true,
50-
"PHP_EXT_PCNTL": true,
51-
"PHP_EXT_PDO_DBLIB": true,
52-
"PHP_EXT_PDO_FIREBIRD": true,
53-
"PHP_EXT_PDO_MYSQL": true,
54-
"PHP_EXT_PDO_ODBC": true,
55-
"PHP_EXT_PDO_PGSQL": true,
56-
"PHP_EXT_PGSQL": true,
57-
"PHP_EXT_PSPELL": true,
58-
"PHP_EXT_READLINE": true,
59-
"PHP_EXT_SHMOP": true,
60-
"PHP_EXT_SNMP": true,
61-
"PHP_EXT_SOAP": true,
62-
"PHP_EXT_SOCKETS": true,
63-
"PHP_EXT_SODIUM": true,
64-
"PHP_EXT_STANDARD_ARGON2": true,
65-
"PHP_EXT_SYSVMSG": true,
66-
"PHP_EXT_SYSVSEM": true,
67-
"PHP_EXT_SYSVSHM": true,
68-
"PHP_EXT_TIDY": true,
69-
"PHP_EXT_XSL": true,
70-
"PHP_EXT_ZEND_TEST": true,
71-
"PHP_EXT_ZIP": true,
72-
"PHP_EXT_ZLIB": true,
73-
74-
"PHP_SAPI_APACHE2HANDLER": true,
75-
"PHP_SAPI_EMBED": true,
76-
"PHP_SAPI_FPM": true,
77-
"PHP_SAPI_FPM_ACL": true,
78-
"PHP_SAPI_FPM_APPARMOR": true,
79-
"PHP_SAPI_FPM_SELINUX": true,
80-
"PHP_SAPI_FPM_SYSTEMD": true,
81-
"PHP_SAPI_LITESPEED": true,
82-
"PHP_SAPI_PHPDBG_SHARED": true
83-
}
14+
"toolchainFile": "${sourceDir}/php-build/php/build/Release/generators/conan_toolchain.cmake"
8415
}
8516
],
8617
"buildPresets": [

0 commit comments

Comments
 (0)