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 e0db7d16f27dc5d6b05fb02fea8dd64f296b5f87..af82be1b5c41b0ff59bf1c4eaffeca3d470ea3ad 100644 (file)
--- 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 6c00193b27c1f4e371768e3b1dca84886b062217..93cf6a57a12bfe31b05166db0d29fff18892f310 100644 (file)
--- 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