From e5e1886bc765febb40f631d54053f2c08c241767 Mon Sep 17 00:00:00 2001
From: Peter Sykora <psykora@gmail.com>
Date: Sun, 13 Jan 2019 14:53:08 +0100
Subject: [PATCH] [chore] Fix 3rd party dependencies Qt and their automatic
 installation

---
 .gitignore                            |  2 ++
 CCEngine.sln                          |  1 +
 CCEngine/CCEngine.vcxproj             |  2 +-
 CCEngineLoader/CCEngineLoader.vcxproj |  2 +-
 workspace.bat                         | 26 +++++++++++++++-----------
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0b8beb5..e71c30a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@
 /CCEngineLoader/GeneratedFiles/
 /CCEngine/GeneratedFiles/
 /CCEngine/CCEngine.aps
+/CCEngine/build/
+/CCEngineLoader/build/
diff --git a/CCEngine.sln b/CCEngine.sln
index a96f4fa..df7ef2a 100644
--- a/CCEngine.sln
+++ b/CCEngine.sln
@@ -43,6 +43,7 @@ Global
 		{E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73} = {44063F88-E25A-4C9D-AC11-9868D4CDD704}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
+		Qt5Version = $(DefaultQtVersion)
 		SolutionGuid = {4CBA44D0-8074-48F8-A6DD-5914FE3F0026}
 	EndGlobalSection
 EndGlobal
diff --git a/CCEngine/CCEngine.vcxproj b/CCEngine/CCEngine.vcxproj
index 3e49913..7adc3d3 100644
--- a/CCEngine/CCEngine.vcxproj
+++ b/CCEngine/CCEngine.vcxproj
@@ -171,7 +171,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_Win32="qt-5.10.1" MocOptions="" />
+      <UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_Win32="$(DefaultQtVersion)" MocOptions="" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/CCEngineLoader/CCEngineLoader.vcxproj b/CCEngineLoader/CCEngineLoader.vcxproj
index af4c7b3..69e6a5c 100644
--- a/CCEngineLoader/CCEngineLoader.vcxproj
+++ b/CCEngineLoader/CCEngineLoader.vcxproj
@@ -141,7 +141,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_Win32="qt-5.10.1" MocOptions="" />
+      <UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_Win32="$(DefaultQtVersion)" MocOptions="" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/workspace.bat b/workspace.bat
index 5fcf611..244fff0 100644
--- a/workspace.bat
+++ b/workspace.bat
@@ -1,32 +1,36 @@
-
 setlocal
 
+rem === To be executed from VS Native Tools command prompt === 
+rem === Conan package manager needs to be installed and in PATH ===
+
 set GENERATOR=visual_studio_multi
 set CONAN=conan
 set ARCH=x86
 
 SET SCRIPTDIR=%~dp0
 
+rem === Make sure that the bincrafters remote exists === 
+%CONAN% remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
+
+rem === Install all dependencies for all projects ===
 mkdir %SCRIPTDIR%\CCEngine\build
 cd %SCRIPTDIR%\CCEngine\build
-%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Debug
-rem --build=libcurl
-%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release
-rem --build=libcurl
+%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Debug --build=outdated
+%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release --build=outdated
 
 mkdir %SCRIPTDIR%\CCEngineLoader\build
 cd %SCRIPTDIR%\CCEngineLoader\build
-%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Debug
-%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release
+%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Debug --build=outdated
+%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release --build=outdated
 
 mkdir %SCRIPTDIR%\..\libLicenseClient\build
 cd %SCRIPTDIR%\..\libLicenseClient\build
-%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Debug
-%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release
+%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Debug --build=outdated
+%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release --build=outdated
 
 mkdir %SCRIPTDIR%\..\libLicenseClient\test\build
 cd %SCRIPTDIR%\..\libLicenseClient\test\build
-%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Debug
-%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release
+%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Debug --build=outdated
+%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release --build=outdated
 
 endlocal