From 736f67cd2277fcd3dba2918bcd6c12152bd305e0 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 7 Sep 2017 08:43:06 +0200
Subject: [PATCH] [Conan] Switching to Artifactory repo.
---
.appveyor.yml | 2 +-
scripts/cmake/ConanSetup.cmake | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.appveyor.yml b/.appveyor.yml
index 808f4e16d41..cd807f551c3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -27,7 +27,7 @@ install:
- if not exist "C:\projects\deps\conan\" mkdir C:\projects\deps\conan
- set PATH=%PYTHON%/Scripts/;%PATH%
- pip.exe install conan --upgrade
- - conan remote add -i 0 ogs https://api.bintray.com/conan/ogs/conan
+ - conan remote add -i 0 ogs https://ogs.jfrog.io/ogs/api/conan/conan
# Install Ninja
- set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip"
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index bcad6d8602f..b3791f5f38a 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -47,5 +47,6 @@ endforeach()
conan_cmake_run(REQUIRES ${CONAN_REQUIRES}
OPTIONS ${CONAN_OPTIONS}
BASIC_SETUP
+ UPDATE
BUILD missing
)
--
GitLab