From 2ea6f391b4c466f9c4a182d7399201b226a179e0 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Thu, 31 Dec 2020 14:43:50 +0100 Subject: [PATCH] Use environment variable to determine compiler version for conan. --- .drone.yml | 3 ++- CmakeConanSetup.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index f3e20d7..799de88 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,6 +62,7 @@ steps: CXX: x86_64-w64-mingw32-g++ STRIP: x86_64-w64-mingw32-strip RC: x86_64-w64-mingw32-windres + CONAN_ENV_COMPILER_VERSION: 9.3 commands: - conan remote add epsilon-public https://packages.p-epsilon.com/ - update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix @@ -97,6 +98,6 @@ steps: - conan user --clean --- kind: signature -hmac: 112679930159db2592105125cef7d2254c740532559f8d048ae3b2ed86364d83 +hmac: ba0cd11e5fc5d2154fc5adec2cb488c828d7a50e29f621d8c9ceee42d51b1005 ... diff --git a/CmakeConanSetup.cmake b/CmakeConanSetup.cmake index 49f2d1f..f338db9 100644 --- a/CmakeConanSetup.cmake +++ b/CmakeConanSetup.cmake @@ -21,7 +21,7 @@ function(SetupConan) else () execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build outdated -s compiler=gcc - -s compiler.version=9.3 + -s compiler.version=$ENV{CONAN_ENV_COMPILER_VERSION} -s compiler.libcxx=libstdc++11 -s os=Windows -o *:shared=True