From bcf0136e0175eb5d405a03c4592fd6a766b5e7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Fri, 26 Oct 2018 16:04:42 +0200
Subject: [PATCH] - Removed VS2012 - Added checks for Libpath and QT5 install
 path

---
 CI/Windows.bat | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/CI/Windows.bat b/CI/Windows.bat
index c96a9e6c..117056ce 100644
--- a/CI/Windows.bat
+++ b/CI/Windows.bat
@@ -16,22 +16,6 @@ IF "%SHARED%" == "TRUE" (
   set STRING_DLL=
 )
 
-IF "%BUILD_PLATFORM%" == "VS2012" (
-    set LIBPATH=E:\libs\VS2012
-    set GTESTVERSION=gtest-1.6.0
-    set GENERATOR=Visual Studio 11%ARCH_VS%
-    set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\devenv.com"
-    IF "%ARCHITECTURE%" == "x64" (
-      set QT_INSTALL_PATH=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\
-      set QT_BASE_CONFIG=-DQT_QMAKE_EXECUTABLE=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\bin\qmake.exe
-    )
-
-    IF "%ARCHITECTURE%" == "x32" (
-      set QT_INSTALL_PATH=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\
-      set QT_BASE_CONFIG=-DQT_QMAKE_EXECUTABLE=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\bin\qmake.exe 
-    )
-) 
-
 IF "%BUILD_PLATFORM%" == "VS2013" (
     set LIBPATH=E:\libs\VS2013
     set GTESTVERSION=gtest-1.6.0
@@ -95,6 +79,9 @@ IF "%APPS%" == "ON" (
   set CMAKE_CONFIGURATION=
 )
 
+
+
+
 ECHO "============================================================="
 ECHO "============================================================="
 ECHO "Building with :"
@@ -111,7 +98,23 @@ ECHO "QT_INSTALL_PATH     : %QT_INSTALL_PATH%"
 ECHO "CMAKE_CONFIGURATION : %CMAKE_CONFIGURATION%"
 ECHO "============================================================="
 ECHO "============================================================="
+ECHO ""
+ECHO "Running Build environment checks"
 
+IF EXIST %LIBPATH%\ (
+  ECHO "LIBPATH ... Ok"
+) ELSE (
+  ECHO "LIBPATH not found!"
+  exit 10;
+)
+
+
+IF EXIST %QT_INSTALL_PATH%\ (
+  ECHO "QT_INSTALL_PATH ... Ok"
+) ELSE (
+  ECHO "QT_INSTALL_PATH not found!"
+  exit 10;
+)
 
 
 "C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%"  -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% ..