From f68646865b4586299185cefd10ed03f0bcfb39de Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 21 Feb 2019 11:10:53 +0100
Subject: [PATCH] [CMake] Speed-up Conan setup a little bit.
---
scripts/cmake/ConanSetup.cmake | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index e851672d73d..ea57ad69c20 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -78,12 +78,6 @@ if(OGS_BUILD_GUI)
endif()
conan_check(VERSION 1.3.0)
-conan_add_remote(NAME ogs INDEX 0
- URL https://ogs.jfrog.io/ogs/api/conan/conan)
-conan_add_remote(NAME conan-community INDEX 1
- URL https://api.bintray.com/conan/conan-community/conan)
-conan_add_remote(NAME bincrafters INDEX 2
- URL https://api.bintray.com/conan/bincrafters/public-conan)
message(STATUS "Third-party libraries:")
foreach(LIB ${OGS_LIBS})
@@ -112,6 +106,12 @@ string(TIMESTAMP timestamp "%Y.%m.%d")
if("${file_timestamp}" VERSION_LESS ${timestamp} OR IS_CI)
file(WRITE ${PROJECT_BINARY_DIR}/conan_install_timestamp.txt "${timestamp}\n")
set(CONAN_UPDATE UPDATE)
+ conan_add_remote(NAME ogs INDEX 0
+ URL https://ogs.jfrog.io/ogs/api/conan/conan)
+ conan_add_remote(NAME conan-community INDEX 1
+ URL https://api.bintray.com/conan/conan-community/conan)
+ conan_add_remote(NAME bincrafters INDEX 2
+ URL https://api.bintray.com/conan/bincrafters/public-conan)
else()
message(STATUS "Conan: Skipping update step.")
endif()
--
GitLab