From a3f5048915e3338bba0f60b95a20cfacd3be5fc8 Mon Sep 17 00:00:00 2001
From: Martin Shetty <1972005+martukas@users.noreply.github.com>
Date: Tue, 21 Mar 2023 16:04:59 -0400
Subject: [PATCH] locked conan to 1.59 for now; updates #1324

---
 software/gui/CMakeLists.txt | 3 +--
 software/gui/conanfile.txt  | 4 ++--
 software/gui/gui.sh         | 7 ++++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/software/gui/CMakeLists.txt b/software/gui/CMakeLists.txt
index d980abc52..d8518fa60 100644
--- a/software/gui/CMakeLists.txt
+++ b/software/gui/CMakeLists.txt
@@ -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()
 
diff --git a/software/gui/conanfile.txt b/software/gui/conanfile.txt
index 8e7312d8c..71d808517 100644
--- a/software/gui/conanfile.txt
+++ b/software/gui/conanfile.txt
@@ -1,6 +1,6 @@
 [requires]
-fmt/8.1.1
-spdlog/1.9.2
+fmt/9.1.0
+spdlog/1.11.0
 
 [generators]
 cmake
diff --git a/software/gui/gui.sh b/software/gui/gui.sh
index 6b6f946c5..9f41337b6 100755
--- a/software/gui/gui.sh
+++ b/software/gui/gui.sh
@@ -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
@@ -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