mirror of
https://github.com/curl/curl.git
synced 2026-07-09 20:47:21 +03:00
try ninja multi-config
This commit is contained in:
parent
e62c7a3ffd
commit
b6c7bd166b
1 changed files with 2 additions and 1 deletions
3
.github/workflows/windows.yml
vendored
3
.github/workflows/windows.yml
vendored
|
|
@ -836,6 +836,7 @@ jobs:
|
|||
[ "${MATRIX_ARCH}" = 'x86' ] && options+=' -A Win32'
|
||||
options+=" -DCMAKE_VS_GLOBALS=TrackFileAccess=false${vsglobals}"
|
||||
options+=' -D_CURL_SKIP_BUILD_CERTS=ON'
|
||||
unset CMAKE_GENERATOR
|
||||
else
|
||||
# Use Ninja when running tests to avoid MSBuild heuristics picking
|
||||
# up "error messages" in the test log output and making the job fail.
|
||||
|
|
@ -871,12 +872,12 @@ jobs:
|
|||
ldflags+=" -libpath:$MSDK_LIBW/ucrt/$MATRIX_ARCH"
|
||||
ldflags+=" -libpath:$MSDK_LIBW/um/$MATRIX_ARCH"
|
||||
ldflags+=" -libpath:$MSDK_LIBW/km/$MATRIX_ARCH"
|
||||
options+=' -G Ninja'
|
||||
options+=" -DCMAKE_RC_COMPILER=$MSDK_BINU/rc.exe"
|
||||
options+=" -DCMAKE_MT=$MSDK_BINU/mt.exe"
|
||||
options+=" -DCMAKE_C_COMPILER=$MSVC_BINU/cl.exe"
|
||||
rcflags+=" -I$MSDK_INCW/shared"
|
||||
rcflags+=" -I$MSDK_INCW/um"
|
||||
export CMAKE_GENERATOR='Ninja Multi-Config'
|
||||
fi
|
||||
[ "${_chkprefill}" = '_chkprefill' ] && options+=' -D_CURL_PREFILL=OFF'
|
||||
if [ -n "${MATRIX_INSTALL_VCPKG}" ]; then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue