Skip to content
Snippets Groups Projects
Commit 814db0a5 authored by René Paris's avatar René Paris
Browse files

fix(CI): Fix conanbuild

- Added b2 as requirement, forcing it to use gcc as toolchain
- Add toolchain generator to windows profile for bzip

Closes #273
parent 4f0e5f50
No related branches found
No related tags found
1 merge request!255fix: Installation instructions and build pipeline
[requires] [requires]
gtest/1.14.0 gtest/1.14.0
b2/5.2.1
bzip2/1.0.8 bzip2/1.0.8
boost/1.85.0 boost/1.85.0
zlib/1.2.13 zlib/1.2.13
...@@ -16,7 +17,6 @@ yase/0.1 ...@@ -16,7 +17,6 @@ yase/0.1
openscenario_api/v1.3.1 openscenario_api/v1.3.1
openscenario_engine/commitid openscenario_engine/commitid
[options] [options]
libxml2/*:shared=False libxml2/*:shared=False
libxml2/*:include_utils=False libxml2/*:include_utils=False
......
...@@ -12,4 +12,5 @@ os.subsystem=msys2 ...@@ -12,4 +12,5 @@ os.subsystem=msys2
tools.build:jobs=1 tools.build:jobs=1
tools.system.package_manager:mode=install tools.system.package_manager:mode=install
tools.microsoft.bash:subsystem=msys2 tools.microsoft.bash:subsystem=msys2
tools.microsoft.bash:path=C:/op/msys64/usr/bin/bash.exe tools.microsoft.bash:path=C:/op/msys64/usr/bin/bash.exe
\ No newline at end of file tools.cmake.cmaketoolchain:generator=MSYS Makefiles
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment