luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

appveyor: try 64-bit again 1

Browse Source
This commit is contained in:
Viktor Szakats 2025-02-27 00:11:01 +01:00
parent ff78634c29
commit 6808693198
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
appveyor.sh
View File

@ -50,11 +50,12 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
for _chkprefill in '' ${CHKPREFILL:-}; do
options=''
[ "${_chkprefill}" = '_chkprefill' ] && options+=' -D_CURL_PREFILL=OFF'
[[ "${TARGET}" = *'ARM64'* ]] && SKIP_RUN='ARM64 architecture'
[[ "${TARGET:-}" = *'ARM64'* ]] && SKIP_RUN='ARM64 architecture'
[ -n "${TOOLSET:-}" ] && options+=" -T ${TOOLSET}"
[ "${OPENSSL}" = 'ON' ] && options+=" -DOPENSSL_ROOT_DIR=${openssl_root_win}"
[ -n "${CURLDEBUG:-}" ] && options+=" -DENABLE_CURLDEBUG=${CURLDEBUG}"
if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = 'Visual Studio 2013' ]; then
cp '/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin/vcvars64.bat' '/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin/amd64/vcvarsamd64.bat'
mkdir "_bld${_chkprefill}"
cd "_bld${_chkprefill}"
options+=' ..'
@ -66,7 +67,7 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
root='.'
fi
# shellcheck disable=SC2086
cmake -G "${PRJ_GEN}" ${TARGET} \
cmake -G "${PRJ_GEN}" ${TARGET:-} \
-DCURL_TEST_BUNDLES=ON \
-DCURL_WERROR=ON \
-DBUILD_SHARED_LIBS="${SHARED}" \
@ -88,7 +89,7 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
echo 'curl_config.h'; grep -F '#define' _bld/lib/curl_config.h | sort || true
# shellcheck disable=SC2086
if ! cmake --build _bld --config "${PRJ_CFG}" --parallel 2 -- ${BUILD_OPT:-}; then
if [ "${PRJ_GEN}" = 'Visual Studio 9 2008' ]; then
if [[ "${PRJ_GEN}" = 'Visual Studio 9 2008'* ]]; then
find . -name BuildLog.htm -exec dos2unix '{}' +
find . -name BuildLog.htm -exec cat '{}' +
fi

8
appveyor.yml
View File

@ -70,6 +70,14 @@ environment:
SCHANNEL: 'ON'
SHARED: 'ON'
EXAMPLES: 'OFF'
- job_name: 'CMake, VS2008, Debug, x64, OpenSSL 1.0.2 + Schannel, Shared, Build-tests & examples'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2013'
PRJ_GEN: 'Visual Studio 9 2008 Win64'
PRJ_CFG: Debug
OPENSSL: 'ON'
SCHANNEL: 'ON'
SHARED: 'ON'
EXAMPLES: 'OFF'
- job_name: 'CMake, VS2010, Debug, x64, Schannel, Shared, Build-tests & examples'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
PRJ_GEN: 'Visual Studio 10 2010'