status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Lock down conan.cmake file version to avoid having upstream break our builds

This commit is contained in:
Pedro Pombeiro 2018-11-20 14:07:34 +01:00
parent 1e241b5a90
commit 5f2958ba9d
No known key found for this signature in database
GPG Key ID: A65DEB11E4BBC647
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desktop/CMakeModules/QtConfiguration.cmake
View File

@ -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 # 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") if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") 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") "${CMAKE_BINARY_DIR}/conan.cmake")
endif() endif()
@ -38,8 +38,7 @@ if(WIN32)
endif() endif()
conan_cmake_run(REQUIRES qt5-mxe/5.11.2@status-im/stable conan_cmake_run(REQUIRES qt5-mxe/5.11.2@status-im/stable
PROFILE ../node_modules/status-conan/profiles/status-mingw32-x86_64 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} OPTIONS ${_QT_PACKAGE_OPTIONS}
BUILD never) BUILD never)