Skip to content

Commit

Permalink
locked conan to 1.59 for now; updates #1324
Browse files Browse the repository at this point in the history
  • Loading branch information
martukas committed Mar 21, 2023
1 parent 174fb66 commit a3f5048
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
3 changes: 1 addition & 2 deletions software/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ include(EnsureBuildType)

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/v0.16.1/conan.cmake"
file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake"
"${CMAKE_BINARY_DIR}/conan.cmake"
EXPECTED_HASH SHA256=396e16d0f5eabdc6a14afddbcfff62a54a7ee75c6da23f32f7a31bc85db23484
TLS_VERIFY ON)
endif()

Expand Down
4 changes: 2 additions & 2 deletions software/gui/conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[requires]
fmt/8.1.1
spdlog/1.9.2
fmt/9.1.0
spdlog/1.11.0

[generators]
cmake
Expand Down
7 changes: 6 additions & 1 deletion software/gui/gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
# This script is designed for local unix usage.
# ./gui.sh --help

# \todo: keep CONAN_VERSION updated, test thoroughly whenever you do, leave this "todo" here
CONAN_VERSION=1.59

# Fail if any command fails
set -e
set -o pipefail
Expand Down Expand Up @@ -120,7 +123,9 @@ install_linux() {

configure_conan() {
sudo pip3 install -U pip
sudo pip3 install conan gitpython
pip3 install gitpython
pip3 install conan==$CONAN_VERSION
conan --version
#source ${HOME}/.profile
conan profile new --detect default
conan profile update settings.compiler.libcxx=libstdc++11 default
Expand Down

0 comments on commit a3f5048

Please sign in to comment.