From 5f2958ba9d9875e6de415d3600a08f5c3f01e282 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Tue, 20 Nov 2018 14:07:34 +0100 Subject: [PATCH] Lock down conan.cmake file version to avoid having upstream break our builds --- desktop/CMakeModules/QtConfiguration.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/desktop/CMakeModules/QtConfiguration.cmake b/desktop/CMakeModules/QtConfiguration.cmake index c7bcff4f28..a81a07677b 100644 --- a/desktop/CMakeModules/QtConfiguration.cmake +++ b/desktop/CMakeModules/QtConfiguration.cmake @@ -25,7 +25,7 @@ if(WIN32) # TODO: Create packages of qt5 for Linux and MacOS too, so that we can rely strictly on this branch of code if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") - file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/master/conan.cmake" + file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/9cc97acda619b7917f140415241785a864482b11/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake") endif() @@ -38,8 +38,7 @@ if(WIN32) endif() conan_cmake_run(REQUIRES qt5-mxe/5.11.2@status-im/stable PROFILE ../node_modules/status-conan/profiles/status-mingw32-x86_64 - BASIC_SETUP - SETTINGS "qt5-mxe:os=Windows qt5-mxe:arch=x86_64" + SETTINGS "qt5-mxe:os=Windows" "qt5-mxe:arch=x86_64" OPTIONS ${_QT_PACKAGE_OPTIONS} BUILD never)