From 5a1e74d5101d97614de73b6da556c78c7902957c Mon Sep 17 00:00:00 2001 From: Axel Naumann Date: Wed, 30 Mar 2022 15:09:00 +0200 Subject: [PATCH] [cmake] Bump davix to 0.8.1: Fixes macOS 12 builds. neon is gone, and curl is already part of davix.a (https://github.com/cern-fts/davix/issues/93). --- builtins/davix/CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/builtins/davix/CMakeLists.txt b/builtins/davix/CMakeLists.txt index 86b645bec59338..d938b102707d99 100644 --- a/builtins/davix/CMakeLists.txt +++ b/builtins/davix/CMakeLists.txt @@ -10,16 +10,14 @@ find_package(libuuid REQUIRED) find_package(LibXml2 REQUIRED) find_package(OpenSSL REQUIRED) -set(DAVIX_VERSION "0.7.6") +set(DAVIX_VERSION "0.8.1") set(DAVIX_URL "http://lcgpackages.web.cern.ch/lcgpackages/tarFiles/sources") -set(DAVIX_URLHASH "SHA256=fc9b5341d006482755684052328740449f2decc33ad7b5ba3e2c614fe602e6e2") +set(DAVIX_URLHASH "SHA256=3f42f4eadaf560ab80984535ffa096d3e88287d631960b2193e84cf29a5fe3a6") set(DAVIX_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/DAVIX-prefix) set(DAVIX_LIBNAME ${CMAKE_STATIC_LIBRARY_PREFIX}davix${CMAKE_STATIC_LIBRARY_SUFFIX}) -foreach(lib davix neon) - set(libname ${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}) - list(APPEND DAVIX_LIBRARIES ${DAVIX_PREFIX}/lib/${libname}) -endforeach() +set(DAVIX_LIBRARIES + ${DAVIX_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}davix${CMAKE_STATIC_LIBRARY_SUFFIX}) string(REPLACE "-Werror " "" DAVIX_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")