Merge branch 'useWindowsVM' into 'develop'

Use the Windows 10 VM

See merge request !370

.gitlab-ci.yml

@@ -28,10 +28,36 @@ windows:
     - Windows
   stage: build
   variables:
-    GIT_DEPTH: 1 # shallow cloning
+    GIT_DEPTH: "1" # shallow cloning
   script:
-    # run local Powershell script
-    - ./winbuild.ps1
+    - $OPTLIBS = "C:/opt/x64"
+    - $FFTW3_INCLUDE_DIR = "$OPTLIBS/include"
+    - $FFTW3_LIB = "$OPTLIBS/lib/libfftw3-3.lib"
+    - $QTDIR = "C:/Qt/current/msvc2019_64"
+    - $QTCMake_DIR = "$QTDIR/lib/cmake"
+    - $BUILD_DIR = "build"
+    - echo "#--- DIAGNOSTICS ---"
+    # list powershell properties
+    - echo "# Powershell <$PSHOME>`n  PS Profile <$PROFILE>`n  PS Command-Path <$PSCOMMANDPATH>"
+    # list all environmental variables
+    - echo "----------------------------------------"
+    - 'dir Env:'
+    # make the CMake build directory
+    - echo "----------------------------------------"
+    - mkdir -Force "$BUILD_DIR"
+    - cd "$BUILD_DIR"
+    - pwd
+    - echo "#--- CONFIGURE ---"
+    - cmake --version
+    - cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLIB_MAN=OFF -DQTDIR="$QTDIR" -DQt5_DIR="$QTCMake_DIR/Qt5" -DQt5Test_DIR="$QTCMake_DIR/Qt5Test"     -DFFTW3_INCLUDE_DIR="$FFTW3_INCLUDE_DIR" -DFFTW3_LIBRARY="$FFTW3_LIB" -DCMAKE_INCLUDE_PATH="$OPTLIBS/include" -DCMAKE_LIBRARY_PATH="$OPTLIBS/lib" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -B. ..
+    - echo "#--- BUILD ---"
+    - pwd
+    - cmake --build . --config Release --clean-first
+    - echo "#--- TEST ---"
+    - ctest -C Release --parallel 8 --output-on-failure
+    - echo "#--- PACKAGING ---"
+    # build package via NSIS
+    - cpack -C Release --verbose
   artifacts:
     paths:
     - build/*.exe

winbuild.ps1 → devtools/deploy/winbuild.ps1

@@ -2,10 +2,13 @@
 # execute under windows:
 # $ powershell <build-script>
 
+# stop on first error
+$ErrorActionPreference = "Stop"
+
 $OPTLIBS = "C:/opt/x64"
 $FFTW3_INCLUDE_DIR = "$OPTLIBS/include"
 $FFTW3_LIB = "$OPTLIBS/lib/libfftw3-3.lib"
-$QTDIR = "C:/Qt/5.14.1/msvc2017_64"
+$QTDIR = "C:/Qt/current/msvc2019_64"
 $QTCMake_DIR = "$QTDIR/lib/cmake"
 $BUILD_DIR = "build"