Merge branch 'VS2019' into 'master'

Vs2019

See merge request OpenMesh/OpenMesh!292

.gitlab-ci.yml

@@ -412,6 +412,101 @@ macos-cpp14-release:
 # Windows tasks
 # -----------------
 
+#-------------  Job Informations:
+# Type:         Build+Test: Release
+# OS:           Windows
+# Architecture: x64
+# Shared:       TRUE
+# VS Version:   VS2019
+# Apps:         {{APPS}}
+
+build-VS2019-x64-shared-TRUE-apps:
+  stage: build
+  variables:
+    BUILD_PLATFORM: "VS2019"
+    ARCHITECTURE:   "x64"
+    SHARED:         "TRUE"
+    APPS:           "ON"
+  script: "CI\\Windows.bat"
+  tags:
+    - VS2019
+    - Qt5150
+  artifacts:
+    paths:
+      - build-release/*.exe
+    reports:
+      junit:
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
+
+build-VS2019-x64-shared-TRUE-no-apps:
+  stage: build
+  variables:
+    BUILD_PLATFORM: "VS2019"
+    ARCHITECTURE:   "x64"
+    SHARED:         "TRUE"
+    APPS:           "OFF"
+  script: "CI\\Windows.bat"
+  tags:
+    - VS2019
+  artifacts:
+    paths:
+      - build-release/*.exe
+    reports:
+      junit:
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
+
+#-------------  Job Informations:
+# Type:         Build+Test: Release
+# OS:           Windows
+# Architecture: x64
+# Shared:       FALSE
+# VS Version:   VS2019
+# Apps:         {{APPS}}
+
+build-VS2019-x64-shared-FALSE-apps:
+  stage: build
+  variables:
+    BUILD_PLATFORM: "VS2019"
+    ARCHITECTURE:   "x64"
+    SHARED:         "FALSE"
+    APPS:           "ON"
+  script: "CI\\Windows.bat"
+  tags:
+    - VS2019
+    - Qt5150
+  artifacts:
+    paths:
+      - build-release/*.exe
+    reports:
+      junit:
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
+
+build-VS2019-x64-shared-FALSE-no-apps:
+  stage: build
+  variables:
+    BUILD_PLATFORM: "VS2019"
+    ARCHITECTURE:   "x64"
+    SHARED:         "FALSE"
+    APPS:           "OFF"
+  script: "CI\\Windows.bat"
+  tags:
+    - VS2019
+  artifacts:
+    paths:
+      - build-release/*.exe
+    reports:
+      junit:
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
+
+
 #-------------  Job Informations:
 # Type:         Build+Test: Release
 # OS:           Windows

CI/Windows.bat

@@ -49,6 +49,19 @@ IF "%BUILD_PLATFORM%" == "VS2017" (
 ) 
 
 
+IF "%BUILD_PLATFORM%" == "VS2019" (
+    set LIBPATH=E:\libs\VS2019
+    set GTESTVERSION=gtest-1.10.0
+    set GENERATOR=Visual Studio 16 2019
+    set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.com"
+
+    IF "%ARCHITECTURE%" == "x64" (
+      set QT_INSTALL_PATH=E:\Qt\Qt5.15.0\5.15.0\msvc2019_64
+      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.15.0\5.15.0\msvc2019_64
+    )
+
+)
+
 IF "%APPS%" == "ON" (
   set STRING_APPS=
 

CI/gitlab-ci/windows.yml

@@ -2,6 +2,9 @@
 # Windows tasks
 # -----------------
 
+{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150}
+{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150}
+
 {windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
 {windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}