⬆️ Update conan and cmake

This commit is contained in:
Edgar 2021-02-05 10:42:21 +01:00
parent ce00f92dcf
commit 1370f230a1
No known key found for this signature in database
GPG Key ID: 17D930BB616061A5
3 changed files with 20 additions and 4 deletions

20
.gitignore vendored
View File

@ -1,6 +1,22 @@
build build
tmp tmp
.vscode/ .vscode/
.idea/ .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/

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
set -eu 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 sh /tmp/cmake.sh --exclude-subdir --prefix=/usr/local

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
set -eu 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 dpkg -i /tmp/conan.deb