Skip to content
Snippets Groups Projects
Commit ac9e83b7 authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge branch 'fix-bintray' into 'master'

Fix bintray downloads

Closes #3144

See merge request ogs/ogs!3603
parents 97c7aad8 a68aa2cc
No related branches found
No related tags found
No related merge requests found
...@@ -127,10 +127,9 @@ if("${file_timestamp}" VERSION_LESS ${timestamp} OR DEFINED ENV{CI}) ...@@ -127,10 +127,9 @@ if("${file_timestamp}" VERSION_LESS ${timestamp} OR DEFINED ENV{CI})
set(CONAN_COMMAND ${CONAN_CMD} CACHE INTERNAL "") # Speed up conan_add_remote set(CONAN_COMMAND ${CONAN_CMD} CACHE INTERNAL "") # Speed up conan_add_remote
conan_add_remote(NAME ogs INDEX 0 conan_add_remote(NAME ogs INDEX 0
URL https://ogs.jfrog.io/ogs/api/conan/conan) URL https://ogs.jfrog.io/ogs/api/conan/conan)
conan_add_remote(NAME conan-community INDEX 1 conan_add_remote(NAME bincrafters INDEX 1
URL https://api.bintray.com/conan/conan-community/conan) URL https://bincrafters.jfrog.io/artifactory/api/conan/public-conan)
conan_add_remote(NAME bincrafters INDEX 2 execute_process(COMMAND ${CONAN_COMMAND} config set general.revisions_enabled=1)
URL https://api.bintray.com/conan/bincrafters/public-conan)
else() else()
message(STATUS "Conan: Skipping update step.") message(STATUS "Conan: Skipping update step.")
endif() endif()
......
...@@ -118,7 +118,7 @@ string(REPLACE "." "_" BOOST_VERSION_UNDESCORE ${ogs.minimum_version.boost}) ...@@ -118,7 +118,7 @@ string(REPLACE "." "_" BOOST_VERSION_UNDESCORE ${ogs.minimum_version.boost})
CPMFindPackage( CPMFindPackage(
NAME Boost NAME Boost
VERSION ${ogs.minimum_version.boost} VERSION ${ogs.minimum_version.boost}
URL https://dl.bintray.com/boostorg/release/${ogs.minimum_version.boost}/source/boost_${BOOST_VERSION_UNDESCORE}.tar.gz URL https://boostorg.jfrog.io/artifactory/main/release/${ogs.minimum_version.boost}/source/boost_${BOOST_VERSION_UNDESCORE}.tar.gz
) )
if(Boost_ADDED) if(Boost_ADDED)
add_library(Boost::boost INTERFACE IMPORTED) add_library(Boost::boost INTERFACE IMPORTED)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment