From f9cd6b61354421c824bc5f693591f90a3876076c Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Thu, 31 Dec 2020 14:24:33 +0100 Subject: [PATCH] Use environment variable for compiler version for Windows. Signed-off-by: Deukhoofd --- CmakeConanSetup.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CmakeConanSetup.cmake b/CmakeConanSetup.cmake index cbcc77c..d3f9113 100644 --- a/CmakeConanSetup.cmake +++ b/CmakeConanSetup.cmake @@ -14,7 +14,9 @@ function(SetupConan) -s compiler=clang -s compiler.libcxx=libstdc++11 -o *:shared=True -o *:staticC=${CONAN_STATIC_C}) else () execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build outdated - -s compiler=gcc -s compiler.libcxx=libstdc++11 -s os=Windows -o *:shared=True -o *:staticC=${CONAN_STATIC_C}) + -s compiler=gcc -s compiler.libcxx=libstdc++11 -s compiler.version=$ENV{CONAN_ENV_COMPILER_VERSION} + -s os=Windows -o + *:shared=True -o *:staticC=${CONAN_STATIC_C}) endif () endif () include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)