mirror of
https://github.com/curl/curl.git
synced 2026-08-01 15:18:53 +03:00
CI: realign cmake build settings (for nghttp2, libidn2)
- nghttp2 is now on by default, adjust build configuration accordingly. Follow-up to87aa4ebd82#14136 - GHA/macos: disable libidn2 in combination builds, syncing with autotools. Otherwise it's now auto-detected via pkg-config by default. Follow-up tof43adc2c49#14137 Closes #14364
This commit is contained in:
parent
8a3740bc8e
commit
fadb2ee6ec
3 changed files with 12 additions and 13 deletions
3
.github/workflows/macos.yml
vendored
3
.github/workflows/macos.yml
vendored
|
|
@ -344,7 +344,6 @@ jobs:
|
|||
cmake -B bld -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON \
|
||||
-DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.build.macos-version-min }} \
|
||||
"-DCMAKE_C_COMPILER_TARGET=$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
|
||||
-DUSE_NGHTTP2=ON \
|
||||
${{ matrix.build.generate }}
|
||||
|
||||
- name: 'configure log'
|
||||
|
|
@ -597,7 +596,7 @@ jobs:
|
|||
"-DCMAKE_IGNORE_PREFIX_PATH=$(brew --prefix)" \
|
||||
"-DCMAKE_C_COMPILER_TARGET=$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
|
||||
-DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF \
|
||||
-DUSE_APPLE_IDN=OFF \
|
||||
-DUSE_NGHTTP2=OFF -DUSE_LIBIDN2=OFF -DUSE_APPLE_IDN=OFF \
|
||||
${options}
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue