Upgrade to conan 1.42.1 and revert the ms-gsl package rename @mattgod…

…bolt related conan-io/conan#9952
mattgodbolt · Nov 10, 2021 · c166958 · c166958
1 parent 6e76923
commit c166958
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ include(scripts/conan.cmake)
 
 # See Makefile - CONAN_VERSION 
 message("If the following conan check fails; please remove your .tools directory")
-conan_check(VERSION 1.42.0 REQUIRED)
+conan_check(VERSION 1.42.1 REQUIRED)
 
 conan_add_remote(NAME conancenter
         INDEX 0

diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ CONDA_VERSION?=4.10.3
 CONDA_ROOT:=$(TOOLS_DIR)/conda-$(CONDA_VERSION)
 CONDA_INSTALLER=$(TOOLS_DIR)/conda-$(CONDA_VERSION)/installer.sh
 CONDA:=$(CONDA_ROOT)/bin/conda
-CONAN_VERSION=1.42.0
+CONAN_VERSION=1.42.1
 PIP:=$(CONDA_ROOT)/bin/pip
 CONAN:=$(CONDA_ROOT)/bin/conan
 SOURCE_FILES:=$(shell find src -type f -name \*.c -o -name \*.h -o -name \*.cpp -o -name *.hpp)

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(xania_common STATIC
         Time.hpp
         BitOps.hpp
         StandardBits.hpp)
-target_link_libraries(xania_common CONAN_PKG::fmt CONAN_PKG::Microsoft.GSL CONAN_PKG::spdlog CONAN_PKG::date)
+target_link_libraries(xania_common CONAN_PKG::fmt CONAN_PKG::ms-gsl CONAN_PKG::spdlog CONAN_PKG::date)
 target_include_directories(xania_common PUBLIC ..)
 
 add_subdirectory(test)
diff --git a/src/doorman/CMakeLists.txt b/src/doorman/CMakeLists.txt
@@ -5,7 +5,7 @@ add_library(doorman_lib STATIC
         Logger.cpp Logger.hpp
         TelnetProtocol.cpp TelnetProtocol.hpp
         Xania.cpp Xania.hpp)
-target_link_libraries(doorman_lib xania_lib CONAN_PKG::fmt CONAN_PKG::Microsoft.GSL CONAN_PKG::spdlog CONAN_PKG::lyra)
+target_link_libraries(doorman_lib xania_lib CONAN_PKG::fmt CONAN_PKG::ms-gsl CONAN_PKG::spdlog CONAN_PKG::lyra)
 
 add_executable(doorman main.cpp)
 target_link_libraries(doorman doorman_lib)