From 86563e8058ad30f375f57070b425f37636f6372e Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 18 Jul 2023 10:48:47 +0200 Subject: [PATCH] Remove unused libgcrypt dependency --- cmake_targets/tools/MODULES/FindGcrypt.cmake | 36 -------------------- cmake_targets/tools/build_helper | 3 +- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100755 cmake_targets/tools/MODULES/FindGcrypt.cmake diff --git a/cmake_targets/tools/MODULES/FindGcrypt.cmake b/cmake_targets/tools/MODULES/FindGcrypt.cmake deleted file mode 100755 index fd4517dafb..0000000000 --- a/cmake_targets/tools/MODULES/FindGcrypt.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# - Find gnutls -# Find the native GCRYPT includes and library -# -# GCRYPT_FOUND - True if gnutls found. -# GCRYPT_INCLUDE_DIR - where to find gnutls.h, etc. -# GCRYPT_LIBRARIES - List of libraries when using gnutls. - -if (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARIES) - set(GCRYPT_FIND_QUIETLY TRUE) -endif (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARIES) - -# Include dir -find_path(GCRYPT_INCLUDE_DIR - NAMES - gcrypt.h -) - -# Library -find_library(GCRYPT_LIBRARY - NAMES gcrypt -) - -# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT DEFAULT_MSG GCRYPT_LIBRARY GCRYPT_INCLUDE_DIR) - -IF(GCRYPT_FOUND) - SET( GCRYPT_LIBRARIES ${GCRYPT_LIBRARY} ) -ELSE(GCRYPT_FOUND) - SET( GCRYPT_LIBRARIES ) -ENDIF(GCRYPT_FOUND) - -# Lastly make it so that the GCRYPT_LIBRARY and GCRYPT_INCLUDE_DIR variables -# only show up under the advanced options in the gui cmake applications. -MARK_AS_ADVANCED( GCRYPT_LIBRARY GCRYPT_INCLUDE_DIR ) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 88f84538ef..2d5537bbdd 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -595,7 +595,7 @@ check_install_oai_software() { case "$(get_distribution_release)" in "ubuntu18.04") add_cmake_repo - specific_packages="libgcrypt11-dev" + specific_packages="" ;; "debian11") specific_packages="libz-dev" @@ -645,7 +645,6 @@ check_install_oai_software() { pkgconfig \ libconfig-devel \ libffi-devel \ - libgcrypt-devel \ lksctp-tools \ lksctp-tools-devel \ libtool \