GHA/windows: drop no-op `-DCMAKE_BUILD_TYPE=` from MSVC jobs

They use Visual Studio generators, which are multi-target.
The build command does the Release/Debug selection via `--config`.

Also:
- appveyor: drop unnecessary conditional for 3 options.
  To sync with GHA.
- appveyor: drop unused `-DCMAKE_INSTALL_PREFIX=`.
  To sync with GHA.
- sync cmake option order between GHA and appveyor.

Closes #16372

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 4008282158d8e8c0b5d526b9c002c9d2e13a77f1..cbd9026f0b11b5d10cfc9886eff7c4884e1fa715 100644 (file)
--- 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 a8db45db8c8c96d17d0e918a9654b9e99168f013..e8f7678d60bc7c68759392f576bed144b6c3e711 100644 (file)
--- 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