From a1c2da56ecef9c7a0e17be02f587d7c7f9eee170 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Wed, 24 Apr 2024 22:40:10 +0200 Subject: build: do not use GIT_REPOSITORY for local dependencies This reverts a large portion of 2c1e8f7e96926f70151d737ea32f1e6ff3589263. The conclusion from that commit is incorrect: local builds are not used/updated correctly so much as it's not used at all. Instead the build will always use `master` branch rather than the current files. --- cmake/Deps.cmake | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'cmake') diff --git a/cmake/Deps.cmake b/cmake/Deps.cmake index 7a098415d7..214e015d1c 100644 --- a/cmake/Deps.cmake +++ b/cmake/Deps.cmake @@ -51,19 +51,12 @@ function(get_externalproject_options name DEPS_IGNORE_SHA) string(TOUPPER ${name} name_allcaps) set(url ${${name_allcaps}_URL}) - set(EXTERNALPROJECT_OPTIONS DOWNLOAD_NO_PROGRESS TRUE) + set(EXTERNALPROJECT_OPTIONS + DOWNLOAD_NO_PROGRESS TRUE + EXTERNALPROJECT_OPTIONS URL ${${name_allcaps}_URL}) - if(EXISTS ${url}) - list(APPEND EXTERNALPROJECT_OPTIONS - GIT_REPOSITORY ${${name_allcaps}_URL}) - if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.18) - list(APPEND EXTERNALPROJECT_OPTIONS GIT_REMOTE_UPDATE_STRATEGY CHECKOUT) - endif() - else() - list(APPEND EXTERNALPROJECT_OPTIONS URL ${${name_allcaps}_URL}) - if(NOT ${DEPS_IGNORE_SHA}) - list(APPEND EXTERNALPROJECT_OPTIONS URL_HASH SHA256=${${name_allcaps}_SHA256}) - endif() + if(NOT ${DEPS_IGNORE_SHA}) + list(APPEND EXTERNALPROJECT_OPTIONS URL_HASH SHA256=${${name_allcaps}_SHA256}) endif() set(EXTERNALPROJECT_OPTIONS ${EXTERNALPROJECT_OPTIONS} PARENT_SCOPE) -- cgit