diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4008282158d8..cbd9026f0b11 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -748,13 +748,12 @@ jobs: -DCMAKE_EXE_LINKER_FLAGS="-INCREMENTAL:NO ${ldflags}" \ -DCMAKE_SHARED_LINKER_FLAGS="-INCREMENTAL:NO ${ldflags}" \ -DCMAKE_VS_GLOBALS="TrackFileAccess=false${vsglobals}" \ - -DCMAKE_BUILD_TYPE='${{ matrix.type }}' \ + -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \ + -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE= \ -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \ -DCURL_WERROR=ON \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_DEBUG=ON \ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE= \ ${{ matrix.config }} done if [ -d bld_chkprefill ] && ! diff -u bld/lib/curl_config.h bld_chkprefill/lib/curl_config.h; then diff --git a/appveyor.sh b/appveyor.sh index a8db45db8c8c..e8f7678d60bc 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -52,23 +52,21 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then [ -n "${TOOLSET:-}" ] && options+=" -T ${TOOLSET}" [ "${OPENSSL}" = 'ON' ] && options+=" -DOPENSSL_ROOT_DIR=${openssl_root_win}" [ -n "${CURLDEBUG:-}" ] && options+=" -DENABLE_CURLDEBUG=${CURLDEBUG}" - [ "${PRJ_CFG}" = 'Debug' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG=' - [ "${PRJ_CFG}" = 'Release' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=' - [[ "${PRJ_GEN}" = *'Visual Studio'* ]] && options+=' -DCMAKE_VS_GLOBALS=TrackFileAccess=false' # shellcheck disable=SC2086 cmake -B "_bld${_chkprefill}" -G "${PRJ_GEN}" ${TARGET} \ - -DCURL_USE_OPENSSL="${OPENSSL}" \ - -DCURL_USE_SCHANNEL="${SCHANNEL}" \ - -DHTTP_ONLY="${HTTP_ONLY}" \ - -DBUILD_SHARED_LIBS="${SHARED}" \ - -DCMAKE_UNITY_BUILD="${UNITY}" \ - -DCURL_TEST_BUNDLES=ON \ + -DCMAKE_VS_GLOBALS=TrackFileAccess=false \ + -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \ + -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE= \ + -DCMAKE_UNITY_BUILD="${UNITY}" -DCURL_TEST_BUNDLES=ON \ -DCURL_WERROR=ON \ + -DBUILD_SHARED_LIBS="${SHARED}" \ -DENABLE_DEBUG="${DEBUG}" \ -DENABLE_UNICODE="${ENABLE_UNICODE}" \ - -DCMAKE_INSTALL_PREFIX='C:/curl' \ - -DCMAKE_BUILD_TYPE="${PRJ_CFG}" \ - -DCURL_USE_LIBPSL=OFF ${options} + -DHTTP_ONLY="${HTTP_ONLY}" \ + -DCURL_USE_SCHANNEL="${SCHANNEL}" \ + -DCURL_USE_OPENSSL="${OPENSSL}" \ + -DCURL_USE_LIBPSL=OFF \ + ${options} done if [ -d _bld_chkprefill ] && ! diff -u _bld/lib/curl_config.h _bld_chkprefill/lib/curl_config.h; then cat _bld_chkprefill/CMakeFiles/CMakeConfigureLog.yaml 2>/dev/null || true