petos/CCEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[chore] Fix 3rd party dependencies Qt and their automatic installation

Browse Source
This commit is contained in:
Peter Sykora 2019-01-13 14:53:08 +01:00
parent 1bed9e84b0
commit e5e1886bc7
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -11,3 +11,5 @@
/CCEngineLoader/GeneratedFiles/ /CCEngineLoader/GeneratedFiles/
/CCEngine/GeneratedFiles/ /CCEngine/GeneratedFiles/
/CCEngine/CCEngine.aps /CCEngine/CCEngine.aps
/CCEngine/build/
/CCEngineLoader/build/

1
CCEngine.sln
View File

@ -43,6 +43,7 @@ Global
{E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73} = {44063F88-E25A-4C9D-AC11-9868D4CDD704} {E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73} = {44063F88-E25A-4C9D-AC11-9868D4CDD704}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
Qt5Version = $(DefaultQtVersion)
SolutionGuid = {4CBA44D0-8074-48F8-A6DD-5914FE3F0026} SolutionGuid = {4CBA44D0-8074-48F8-A6DD-5914FE3F0026}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

2
CCEngine/CCEngine.vcxproj
View File

@ -171,7 +171,7 @@
</ImportGroup> </ImportGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <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> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
</Project> </Project>

2
CCEngineLoader/CCEngineLoader.vcxproj
View File

@ -141,7 +141,7 @@
</ImportGroup> </ImportGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <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> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
</Project> </Project>

26
workspace.bat
View File

@ -1,32 +1,36 @@
setlocal 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 GENERATOR=visual_studio_multi
set CONAN=conan set CONAN=conan
set ARCH=x86 set ARCH=x86
SET SCRIPTDIR=%~dp0 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 mkdir %SCRIPTDIR%\CCEngine\build
cd %SCRIPTDIR%\CCEngine\build cd %SCRIPTDIR%\CCEngine\build
%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Debug %CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Debug --build=outdated
rem --build=libcurl %CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release --build=outdated
%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release
rem --build=libcurl
mkdir %SCRIPTDIR%\CCEngineLoader\build mkdir %SCRIPTDIR%\CCEngineLoader\build
cd %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=Debug --build=outdated
%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release %CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release --build=outdated
mkdir %SCRIPTDIR%\..\libLicenseClient\build mkdir %SCRIPTDIR%\..\libLicenseClient\build
cd %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=Debug --build=outdated
%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release %CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release --build=outdated
mkdir %SCRIPTDIR%\..\libLicenseClient\test\build mkdir %SCRIPTDIR%\..\libLicenseClient\test\build
cd %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=Debug --build=outdated
%CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release %CONAN% install .. -g %GENERATOR% -s arch=%ARCH% -s build_type=Release --build=outdated
endlocal endlocal