From 1370f230a167dad6eb3a084d81402aa390150381 Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Fri, 5 Feb 2021 10:42:21 +0100
Subject: [PATCH] :arrow_up: Update conan and cmake

---
 .gitignore       | 20 ++++++++++++++++++--
 install-cmake.sh |  2 +-
 install-conan.sh |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d374c51..7863552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,22 @@
 build
 tmp
-
 .vscode/
-
 .idea/
+
+### CMake ###
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+CMakeUserPresets.json
+
+### CMake Patch ###
+# External projects
+*-prefix/
diff --git a/install-cmake.sh b/install-cmake.sh
index 1586eab..aef1224 100644
--- a/install-cmake.sh
+++ b/install-cmake.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -eu
 
-wget "https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-x86_64.sh" -nv -O /tmp/cmake.sh
+wget "https://github.com/Kitware/CMake/releases/download/v3.19.4/cmake-3.19.4-Linux-x86_64.sh" -nv -O /tmp/cmake.sh
 sh /tmp/cmake.sh --exclude-subdir --prefix=/usr/local
diff --git a/install-conan.sh b/install-conan.sh
index 227346b..da7bbe3 100644
--- a/install-conan.sh
+++ b/install-conan.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -eu
 
-wget "https://dl.bintray.com/conan/installers/conan-ubuntu-64_1_33_0.deb" -nv -O /tmp/conan.deb
+wget "https://dl.bintray.com/conan/installers/conan-ubuntu-64_1_33_1.deb" -nv -O /tmp/conan.deb
 dpkg -i /tmp/conan.deb