From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 1 Jul 2026 11:24:27 +0000 (+0000)
Subject: CI: adjust platform setup for MSVC builds
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=324feb09e57650099e37299da91026d5490eebae;p=thirdparty%2Fdbus.git

CI: adjust platform setup for MSVC builds

In newer versions of CMake, the architecture is specified
using the “-A” parameter.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0db7d16f..af82be1b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -371,7 +371,7 @@ windows vs15-64 cmake:
     - .cmake-common
     - .win-build
   script:
-    - cmake -DCMAKE_PREFIX_PATH=C:/ -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Debug -DDBUS_ENABLE_VERBOSE_MODE=OFF -DDBUS_ENABLE_INTRUSIVE_TESTS=ON -S . -B build
+    - cmake -DCMAKE_PREFIX_PATH=C:/ -G "Visual Studio 15 2017" -A x64 -DCMAKE_BUILD_TYPE=Debug -DDBUS_ENABLE_VERBOSE_MODE=OFF -DDBUS_ENABLE_INTRUSIVE_TESTS=ON -S . -B build
     - cmake --build build --config Debug
     - cmake --install build --config Debug
     # FIXME: a few tests timeout on gitlab runner for unknown reason
diff --git a/tools/docker/windows/Dockerfile b/tools/docker/windows/Dockerfile
index 6c00193b2..93cf6a57a 100644
--- a/tools/docker/windows/Dockerfile
+++ b/tools/docker/windows/Dockerfile
@@ -53,7 +53,7 @@ RUN C:\TEMP\Install.cmd C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --n
 # RUN C:\TEMP\expat.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
 RUN git clone --depth 1 --branch R_2_4_2 https://github.com/libexpat/libexpat
 WORKDIR "/libexpat/expat"
-RUN cmake --install-prefix c:/ -G '"Visual Studio 15 2017 Win64"' .
+RUN cmake --install-prefix c:/ -G '"Visual Studio 15 2017"' -A x64 .
 RUN cmake --build . --config Release
 RUN cmake --install . --config Release