From d03c82efe47559d2b6d9c09fc06089f066ca5c99 Mon Sep 17 00:00:00 2001 From: Edgar Date: Sun, 25 Apr 2021 17:31:44 +0200 Subject: [PATCH] :wrench: Update conan url --- Makefile | 5 +---- install-conan.sh | 4 ++-- templates/install-conan.sh.in | 5 ----- 3 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 templates/install-conan.sh.in diff --git a/Makefile b/Makefile index 60c26e6..3aab02d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,7 @@ -all : cmake conan sccache +all : cmake sccache cmake: cmake -DTOOL=cmake -DREPO=kitware -P update.cmake -conan: - cmake -DTOOL=conan -DREPO=conan-io -P update.cmake - sccache: cmake -DTOOL=sccache -DREPO=mozilla -P update.cmake diff --git a/install-conan.sh b/install-conan.sh index 373e968..8551d77 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_35_2.deb" -nv -O /tmp/conan.deb -dpkg -i /tmp/conan.deb +wget "https://github.com/conan-io/conan/releases/latest/download/conan-ubuntu-64.deb" -nv -O /tmp/conan.deb +dpkg -i /tmp/conan.deb \ No newline at end of file diff --git a/templates/install-conan.sh.in b/templates/install-conan.sh.in deleted file mode 100644 index 4e50106..0000000 --- a/templates/install-conan.sh.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eu - -wget "https://dl.bintray.com/conan/installers/conan-ubuntu-64_@VERSION_UNDERSCORE@.deb" -nv -O /tmp/conan.deb -dpkg -i /tmp/conan.deb \ No newline at end of file