From c2ee81c98741c93ea71ee7677129b185332f6b11 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Tue, 19 Nov 2019 11:52:24 +0100
Subject: [PATCH] [cmake davix] Bump to 0.7.5; get from lcgpackages:
One server is more stable than two servers.
Disable tests - they trigger linker errors.
---
builtins/davix/CMakeLists.txt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/builtins/davix/CMakeLists.txt b/builtins/davix/CMakeLists.txt
index fc7427035f5..18038f7c8cc 100644
--- a/builtins/davix/CMakeLists.txt
+++ b/builtins/davix/CMakeLists.txt
@@ -10,9 +10,9 @@ find_package(libuuid REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(OpenSSL REQUIRED)
-set(DAVIX_VERSION "0.6.7")
-set(DAVIX_URL "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix")
-set(DAVIX_URLHASH "SHA256=1694152a20a5c5e692c4bc545b2efbacec5274fb799e60725412ebae40cced3d")
+set(DAVIX_VERSION "0.7.5")
+set(DAVIX_URL "http://lcgpackages.web.cern.ch/lcgpackages/tarFiles/sources")
+set(DAVIX_URLHASH "SHA256=d920ca976846875d83af4dc50c99280bb3741fcf8351d5733453e70fa5fe6fc8")
set(DAVIX_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/DAVIX-prefix)
set(DAVIX_LIBNAME ${CMAKE_STATIC_LIBRARY_PREFIX}davix${CMAKE_STATIC_LIBRARY_SUFFIX})
@@ -22,7 +22,7 @@ foreach(lib davix neon)
endforeach()
ExternalProject_Add(DAVIX
- URL ${DAVIX_URL}/${DAVIX_VERSION}/davix-embedded-${DAVIX_VERSION}.tar.gz
+ URL ${DAVIX_URL}/davix-${DAVIX_VERSION}.tar.gz
URL_HASH ${DAVIX_URLHASH}
CMAKE_CACHE_ARGS
-DCMAKE_PREFIX_PATH:STRING=${OPENSSL_PREFIX}
@@ -40,6 +40,7 @@ ExternalProject_Add(DAVIX
-DSTATIC_LIBRARY=ON
-DSHARED_LIBRARY=OFF
-DENABLE_TOOLS=OFF
+ -DDAVIX_TESTS=OFF
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
--
GitLab