From 06c4a8ffd6f714045c3048651d7837d731c636a7 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Sun, 5 Nov 2017 18:57:16 +0800 Subject: Find libraries with pkgconfig This is necessary for Flatpak, because Yocto messes with the /usr/bin/*-config files, and really wants everyone to use pkgconfig. A fallback is kept to build on platforms which don't have pkgconfig for those libraries. --- cmake/FindGCrypt.cmake | 59 +++++--------------------------------------------- 1 file changed, 5 insertions(+), 54 deletions(-) (limited to 'cmake/FindGCrypt.cmake') diff --git a/cmake/FindGCrypt.cmake b/cmake/FindGCrypt.cmake index 250f90c9..94c4c3f4 100644 --- a/cmake/FindGCrypt.cmake +++ b/cmake/FindGCrypt.cmake @@ -1,57 +1,8 @@ -set(GCrypt_PKG_CONFIG_NAME gcrypt) - -find_program(GCrypt_CONFIG_EXECUTABLE NAMES libgcrypt-config) -mark_as_advanced(GCrypt_CONFIG_EXECUTABLE) -find_program(GCrypt_SH_EXECUTABLE NAMES sh) -mark_as_advanced(GCrypt_SH_EXECUTABLE) - - -if(GCrypt_CONFIG_EXECUTABLE) - macro(gcrypt_config_fail errcode) - if(${errcode}) - message(FATAL_ERROR "Error invoking libgcrypt-config: ${errcode}") - endif(${errcode}) - endmacro(gcrypt_config_fail) - file(TO_NATIVE_PATH "${GCrypt_CONFIG_EXECUTABLE}" GCrypt_CONFIG_EXECUTABLE) - file(TO_NATIVE_PATH "${GCrypt_SH_EXECUTABLE}" GCrypt_SH_EXECUTABLE) - - execute_process(COMMAND "${GCrypt_SH_EXECUTABLE}" "${GCrypt_CONFIG_EXECUTABLE}" --version - OUTPUT_VARIABLE GCrypt_VERSION - RESULT_VARIABLE ERRCODE - OUTPUT_STRIP_TRAILING_WHITESPACE) - gcrypt_config_fail(${ERRCODE}) - - execute_process(COMMAND "${GCrypt_SH_EXECUTABLE}" "${GCrypt_CONFIG_EXECUTABLE}" --api-version - OUTPUT_VARIABLE GCrypt_API_VERSION - RESULT_VARIABLE ERRCODE - OUTPUT_STRIP_TRAILING_WHITESPACE) - gcrypt_config_fail(${ERRCODE}) - - execute_process(COMMAND "${GCrypt_SH_EXECUTABLE}" "${GCrypt_CONFIG_EXECUTABLE}" --cflags - OUTPUT_VARIABLE GCrypt_CFLAGS - RESULT_VARIABLE ERRCODE - OUTPUT_STRIP_TRAILING_WHITESPACE) - gcrypt_config_fail(${ERRCODE}) - - execute_process(COMMAND "${GCrypt_SH_EXECUTABLE}" "${GCrypt_CONFIG_EXECUTABLE}" --libs - OUTPUT_VARIABLE GCrypt_LDFLAGS - RESULT_VARIABLE ERRCODE - OUTPUT_STRIP_TRAILING_WHITESPACE) - gcrypt_config_fail(${ERRCODE}) - - string(REGEX REPLACE "^(.* |)-l([^ ]*gcrypt[^ ]*)( .*|)$" "\\2" GCrypt_LIBRARY_NAME "${GCrypt_LDFLAGS}") - string(REGEX REPLACE "^(.* |)-L([^ ]*)( .*|)$" "\\2" GCrypt_LIBRARY_DIRS "${GCrypt_LDFLAGS}") - find_library(GCrypt_LIBRARY ${GCrypt_LIBRARY_NAME} HINTS ${GCrypt_LIBRARY_DIRS}) - mark_as_advanced(GCrypt_LIBRARY) - unset(GCrypt_LIBRARY_NAME) - unset(GCrypt_LIBRARY_DIRS) - - if(NOT TARGET gcrypt) - add_library(gcrypt INTERFACE IMPORTED) - set_property(TARGET gcrypt PROPERTY INTERFACE_LINK_LIBRARIES "${GCrypt_LDFLAGS}") - set_property(TARGET gcrypt PROPERTY INTERFACE_COMPILE_OPTIONS "${GCrypt_CFLAGS}") - endif(NOT TARGET gcrypt) -endif(GCrypt_CONFIG_EXECUTABLE) +include(PkgConfigWithFallbackOnConfigScript) +find_pkg_config_with_fallback_on_config_script(GCrypt + PKG_CONFIG_NAME libgcrypt + CONFIG_SCRIPT_NAME libgcrypt +) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GCrypt -- cgit v1.2.3-54-g00ecf