Deukhoofd
/
PkmnLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use environment variable to determine compiler version for conan.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-12-31 14:43:50 +01:00
parent 9d49b4839d
commit 2ea6f391b4
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.drone.yml
View File

@ -62,6 +62,7 @@ steps:
CXX: x86_64-w64-mingw32-g++ CXX: x86_64-w64-mingw32-g++
STRIP: x86_64-w64-mingw32-strip STRIP: x86_64-w64-mingw32-strip
RC: x86_64-w64-mingw32-windres RC: x86_64-w64-mingw32-windres
CONAN_ENV_COMPILER_VERSION: 9.3
commands: commands:
- conan remote add epsilon-public https://packages.p-epsilon.com/ - conan remote add epsilon-public https://packages.p-epsilon.com/
- update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix - update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
@ -97,6 +98,6 @@ steps:
- conan user --clean - conan user --clean
--- ---
kind: signature kind: signature
hmac: 112679930159db2592105125cef7d2254c740532559f8d048ae3b2ed86364d83 hmac: ba0cd11e5fc5d2154fc5adec2cb488c828d7a50e29f621d8c9ceee42d51b1005
... ...

2
CmakeConanSetup.cmake
View File

@ -21,7 +21,7 @@ function(SetupConan)
else () else ()
execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build outdated execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build outdated
-s compiler=gcc -s compiler=gcc
-s compiler.version=9.3 -s compiler.version=$ENV{CONAN_ENV_COMPILER_VERSION}
-s compiler.libcxx=libstdc++11 -s compiler.libcxx=libstdc++11
-s os=Windows -s os=Windows
-o *:shared=True -o *:shared=True