[arch-commits] Commit in weechat/trunk (PKGBUILD weechat-python38.patch)
Christian Rebischke
shibumi at archlinux.org
Fri Dec 13 20:57:22 UTC 2019
Date: Friday, December 13, 2019 @ 20:57:21
Author: shibumi
Revision: 537583
upgpkg: weechat 2.7-1 Remove python3.8 patch and disable php and javascript support
weechat 2.7 supports python3.8 now. Therefore we can drop our patch for it.
Furthermore I've disabled php and javascript support due to build issues with them.
For javascript see also: https://github.com/weechat/weechat/issues/360
Modified:
weechat/trunk/PKGBUILD
Deleted:
weechat/trunk/weechat-python38.patch
------------------------+
PKGBUILD | 21
weechat-python38.patch | 1084 -----------------------------------------------
2 files changed, 10 insertions(+), 1095 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-12-13 20:41:42 UTC (rev 537582)
+++ PKGBUILD 2019-12-13 20:57:21 UTC (rev 537583)
@@ -4,14 +4,15 @@
# Contributor: lucke <lucke at o2 dot pl>
pkgname=weechat
-pkgver=2.6
-pkgrel=5
+pkgver=2.7
+pkgrel=1
pkgdesc="Fast, light and extensible IRC client (curses UI)"
arch=('x86_64')
url="https://www.weechat.org/"
license=('GPL')
depends=('gnutls' 'curl' 'libgcrypt')
-makedepends=('asciidoctor' 'cmake' 'aspell' 'guile2.0' 'lua' 'perl' 'python' 'ruby' 'tcl')
+makedepends=('asciidoctor' 'cmake' 'aspell' 'guile2.0' 'lua' 'perl' 'python'
+'ruby' 'tcl')
optdepends=('aspell: spellchecker support'
'guile2.0: support for guile scripts'
'lua: support for lua scripts'
@@ -19,17 +20,13 @@
'python: support for python scripts'
'ruby: support for ruby scripts'
'tcl: support for tcl scripts')
-source=("https://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.xz"{,.asc}
- "weechat-python38.patch")
-sha512sums=('cf56692e12b2e034675d4c15a8822836b2fcf93d584948e338d263f5a7207edf4599cc72bfb940427146f5f75e7239207cf54f5ed07dd5b6119f68c445725a2d'
- 'SKIP'
- 'a773c345ce691fb48838b3ac5faf427f2596299a0ec3807eee536ac59e3a29502f7379b6b7a43d2864ca4ae55aa57869547fa1c7d70fc3a1c524403f148d7c90')
+source=("https://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.xz"{,.asc})
+sha512sums=('5377cf9c37520cb2b7d1ba43251df3f33d814783ea4bd20d28cb08a2106c8db0e44a392a61929987b807a7d5e69a3c0ed1f3fec122a014b7ea7068e159341075'
+ 'SKIP')
validpgpkeys=('A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8') # WeeChat (signing key) <webmaster at weechat.org>
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # https://github.com/weechat/weechat/pull/1421
- patch -p1 -i ../weechat-python38.patch
}
build() {
@@ -38,7 +35,9 @@
cmake -Wno-dev "${srcdir}/${pkgname}-${pkgver}" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DENABLE_MAN=ON \
- -DENABLE_DOC=ON
+ -DENABLE_DOC=ON \
+ -DENABLE_JAVASCRIPT=OFF \
+ -DENABLE_PHP=OFF
make
}
Deleted: weechat-python38.patch
===================================================================
--- weechat-python38.patch 2019-12-13 20:41:42 UTC (rev 537582)
+++ weechat-python38.patch 2019-12-13 20:57:21 UTC (rev 537583)
@@ -1,1084 +0,0 @@
-From 7208b0ff915fef14431474a397157a847bfc8661 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz at archlinux.org>
-Date: Sun, 10 Nov 2019 09:23:59 -0500
-Subject: [PATCH 1/3] cmake: vendor in a new version of FindPkgConfig
-
-The current one is anciently ancient, and dates back to commit
-4d2925ef1c3dd5df288be55557358b60cbb0926e which vendored this "for old
-versions of cmake". Well, currently it just stops using new versions of
-FindPkgConfig, so we're stuck on the 2006 version from cmake 2.5.0.
-
-Instead of deleting it entirely (the minimum version of cmake is
-currently 3.0) make this vendored file continue to be useful by using it
-to vendor in the latest version of FindPkgConfig from cmake 3.16.0-rc3
-with a bunch of useful improvements.
----
- cmake/FindPkgConfig.cmake | 788 +++++++++++++++++++++++++++++---------
- 1 file changed, 600 insertions(+), 188 deletions(-)
-
-diff --git a/cmake/FindPkgConfig.cmake b/cmake/FindPkgConfig.cmake
-index 360415309..5162a44b3 100644
---- a/cmake/FindPkgConfig.cmake
-+++ b/cmake/FindPkgConfig.cmake
-@@ -1,117 +1,60 @@
--# - a pkg-config module for CMake
--#
--# Usage:
--# pkg_check_modules(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
--# checks for all the given modules
--#
--# pkg_search_module(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
--# checks for given modules and uses the first working one
--#
--# When the 'REQUIRED' argument was set, macros will fail with an error
--# when module(s) could not be found
--#
--# It sets the following variables:
--# PKG_CONFIG_FOUND ... true iff pkg-config works on the system
--# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program
--# <PREFIX>_FOUND ... set to 1 iff module(s) exist
--#
--# For the following variables two sets of values exist; first one is the
--# common one and has the given PREFIX. The second set contains flags
--# which are given out when pkgconfig was called with the '--static'
--# option.
--# <XPREFIX>_LIBRARIES ... only the libraries (w/o the '-l')
--# <XPREFIX>_LIBRARY_DIRS ... the paths of the libraries (w/o the '-L')
--# <XPREFIX>_LDFLAGS ... all required linker flags
--# <XPREFIX>_LDFLAGS_OTHER ... all other linker flags
--# <XPREFIX>_INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I')
--# <XPREFIX>_CFLAGS ... all required cflags
--# <XPREFIX>_CFLAGS_OTHER ... the other compiler flags
--#
--# <XPREFIX> = <PREFIX> for common case
--# <XPREFIX> = <PREFIX>_STATIC for static linking
--#
--# There are some special variables whose prefix depends on the count
--# of given modules. When there is only one module, <PREFIX> stays
--# unchanged. When there are multiple modules, the prefix will be
--# changed to <PREFIX>_<MODNAME>:
--# <XPREFIX>_VERSION ... version of the module
--# <XPREFIX>_PREFIX ... prefix-directory of the module
--# <XPREFIX>_INCLUDEDIR ... include-dir of the module
--# <XPREFIX>_LIBDIR ... lib-dir of the module
--#
--# <XPREFIX> = <PREFIX> when |MODULES| == 1, else
--# <XPREFIX> = <PREFIX>_<MODNAME>
--#
--# A <MODULE> parameter can have the following formats:
--# {MODNAME} ... matches any version
--# {MODNAME}>={VERSION} ... at least version <VERSION> is required
--# {MODNAME}={VERSION} ... exactly version <VERSION> is required
--# {MODNAME}<={VERSION} ... modules must not be newer than <VERSION>
--#
--# Examples
--# pkg_check_modules (GLIB2 glib-2.0)
--#
--# pkg_check_modules (GLIB2 glib-2.0>=2.10)
--# requires at least version 2.10 of glib2 and defines e.g.
--# GLIB2_VERSION=2.10.3
--#
--# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0)
--# requires both glib2 and gtk2, and defines e.g.
--# FOO_glib-2.0_VERSION=2.10.3
--# FOO_gtk+-2.0_VERSION=2.8.20
--#
--# pkg_check_modules (XRENDER REQUIRED xrender)
--# defines e.g.:
--# XRENDER_LIBRARIES=Xrender;X11
--# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
--#
--# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2)
--
--
--# Copyright (C) 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
--#
--# Redistribution and use, with or without modification, are permitted
--# provided that the following conditions are met:
--#
--# 1. Redistributions must retain the above copyright notice, this
--# list of conditions and the following disclaimer.
--# 2. The name of the author may not be used to endorse or promote
--# products derived from this software without specific prior
--# written permission.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
--# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
--# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
--# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
--# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
--# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
--# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
--# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
--# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
--# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-+# file Copyright.txt or https://cmake.org/licensing for details.
-+
-+#[========================================[.rst:
-+FindPkgConfig
-+-------------
-+
-+A ``pkg-config`` module for CMake.
-+
-+Finds the ``pkg-config`` executable and adds the :command:`pkg_get_variable`,
-+:command:`pkg_check_modules` and :command:`pkg_search_module` commands. The
-+following variables will also be set:
-
-+``PKG_CONFIG_FOUND``
-+ if pkg-config executable was found
-+``PKG_CONFIG_EXECUTABLE``
-+ pathname of the pkg-config program
-+``PKG_CONFIG_VERSION_STRING``
-+ version of pkg-config (since CMake 2.8.8)
-+
-+#]========================================]
-
- ### Common stuff ####
- set(PKG_CONFIG_VERSION 1)
--set(PKG_CONFIG_FOUND 0)
-
-+# find pkg-config, use PKG_CONFIG if set
-+if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT "$ENV{PKG_CONFIG}" STREQUAL ""))
-+ set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}" CACHE FILEPATH "pkg-config executable")
-+endif()
- find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
- mark_as_advanced(PKG_CONFIG_EXECUTABLE)
-
--if(PKG_CONFIG_EXECUTABLE)
-- set(PKG_CONFIG_FOUND 1)
--endif(PKG_CONFIG_EXECUTABLE)
-+if (PKG_CONFIG_EXECUTABLE)
-+ execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --version
-+ OUTPUT_VARIABLE PKG_CONFIG_VERSION_STRING
-+ ERROR_QUIET
-+ OUTPUT_STRIP_TRAILING_WHITESPACE)
-+endif ()
-+
-+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-+find_package_handle_standard_args(PkgConfig
-+ REQUIRED_VARS PKG_CONFIG_EXECUTABLE
-+ VERSION_VAR PKG_CONFIG_VERSION_STRING)
-
-+# This is needed because the module name is "PkgConfig" but the name of
-+# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
-+# handled by FPHSA.
-+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
-
- # Unsets the given variables
- macro(_pkgconfig_unset var)
- set(${var} "" CACHE INTERNAL "")
--endmacro(_pkgconfig_unset)
-+endmacro()
-
- macro(_pkgconfig_set var value)
- set(${var} ${value} CACHE INTERNAL "")
--endmacro(_pkgconfig_set)
-+endmacro()
-
- # Invokes pkgconfig, cleans up the result and sets variables
- macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
-@@ -120,55 +63,311 @@ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
- execute_process(
- COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist}
- OUTPUT_VARIABLE _pkgconfig_invoke_result
-- RESULT_VARIABLE _pkgconfig_failed)
-+ RESULT_VARIABLE _pkgconfig_failed
-+ OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- if (_pkgconfig_failed)
- set(_pkgconfig_${_varname} "")
- _pkgconfig_unset(${_prefix}_${_varname})
-- else(_pkgconfig_failed)
-- string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-- string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-+ else()
-+ string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-
- if (NOT ${_regexp} STREQUAL "")
- string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-- endif(NOT ${_regexp} STREQUAL "")
-+ endif()
-
- separate_arguments(_pkgconfig_invoke_result)
-
- #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}")
- set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result})
- _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}")
-- endif(_pkgconfig_failed)
--endmacro(_pkgconfig_invoke)
-+ endif()
-+endmacro()
-+
-+# Internal version of pkg_get_variable; expects PKG_CONFIG_PATH to already be set
-+function (_pkg_get_variable result pkg variable)
-+ _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
-+ set("${result}"
-+ "${prefix_result}"
-+ PARENT_SCOPE)
-+endfunction ()
-
- # Invokes pkgconfig two times; once without '--static' and once with
- # '--static'
- macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp)
- _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN})
- _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN})
--endmacro(_pkgconfig_invoke_dyn)
-+endmacro()
-
- # Splits given arguments into options and a package list
--macro(_pkgconfig_parse_options _result _is_req)
-+macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
- set(${_is_req} 0)
-+ set(${_is_silent} 0)
-+ set(${_no_cmake_path} 0)
-+ set(${_no_cmake_environment_path} 0)
-+ set(${_imp_target} 0)
-+ set(${_imp_target_global} 0)
-+ if(DEFINED PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
-+ if(NOT PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
-+ set(${_no_cmake_path} 1)
-+ set(${_no_cmake_environment_path} 1)
-+ endif()
-+ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
-+ set(${_no_cmake_path} 1)
-+ set(${_no_cmake_environment_path} 1)
-+ endif()
-
- foreach(_pkg ${ARGN})
- if (_pkg STREQUAL "REQUIRED")
- set(${_is_req} 1)
-- endif (_pkg STREQUAL "REQUIRED")
-- endforeach(_pkg ${ARGN})
-+ endif ()
-+ if (_pkg STREQUAL "QUIET")
-+ set(${_is_silent} 1)
-+ endif ()
-+ if (_pkg STREQUAL "NO_CMAKE_PATH")
-+ set(${_no_cmake_path} 1)
-+ endif()
-+ if (_pkg STREQUAL "NO_CMAKE_ENVIRONMENT_PATH")
-+ set(${_no_cmake_environment_path} 1)
-+ endif()
-+ if (_pkg STREQUAL "IMPORTED_TARGET")
-+ set(${_imp_target} 1)
-+ endif()
-+ if (_pkg STREQUAL "GLOBAL")
-+ set(${_imp_target_global} 1)
-+ endif()
-+ endforeach()
-+
-+ if (${_imp_target_global} AND NOT ${_imp_target})
-+ message(SEND_ERROR "the argument GLOBAL may only be used together with IMPORTED_TARGET")
-+ endif()
-
- set(${_result} ${ARGN})
- list(REMOVE_ITEM ${_result} "REQUIRED")
--endmacro(_pkgconfig_parse_options)
-+ list(REMOVE_ITEM ${_result} "QUIET")
-+ list(REMOVE_ITEM ${_result} "NO_CMAKE_PATH")
-+ list(REMOVE_ITEM ${_result} "NO_CMAKE_ENVIRONMENT_PATH")
-+ list(REMOVE_ITEM ${_result} "IMPORTED_TARGET")
-+ list(REMOVE_ITEM ${_result} "GLOBAL")
-+endmacro()
-+
-+# Add the content of a variable or an environment variable to a list of
-+# paths
-+# Usage:
-+# - _pkgconfig_add_extra_path(_extra_paths VAR)
-+# - _pkgconfig_add_extra_path(_extra_paths ENV VAR)
-+function(_pkgconfig_add_extra_path _extra_paths_var _var)
-+ set(_is_env 0)
-+ if(ARGC GREATER 2 AND _var STREQUAL "ENV")
-+ set(_var ${ARGV2})
-+ set(_is_env 1)
-+ endif()
-+ if(NOT _is_env)
-+ if(NOT "${${_var}}" STREQUAL "")
-+ list(APPEND ${_extra_paths_var} ${${_var}})
-+ endif()
-+ else()
-+ if(NOT "$ENV{${_var}}" STREQUAL "")
-+ file(TO_CMAKE_PATH "$ENV{${_var}}" _path)
-+ list(APPEND ${_extra_paths_var} ${_path})
-+ unset(_path)
-+ endif()
-+ endif()
-+ set(${_extra_paths_var} ${${_extra_paths_var}} PARENT_SCOPE)
-+endfunction()
-+
-+# scan the LDFLAGS returned by pkg-config for library directories and
-+# libraries, figure out the absolute paths of that libraries in the
-+# given directories
-+function(_pkg_find_libs _prefix _no_cmake_path _no_cmake_environment_path)
-+ unset(_libs)
-+ unset(_find_opts)
-+
-+ # set the options that are used as long as the .pc file does not provide a library
-+ # path to look into
-+ if(_no_cmake_path)
-+ list(APPEND _find_opts "NO_CMAKE_PATH")
-+ endif()
-+ if(_no_cmake_environment_path)
-+ list(APPEND _find_opts "NO_CMAKE_ENVIRONMENT_PATH")
-+ endif()
-+
-+ unset(_search_paths)
-+ foreach (flag IN LISTS ${_prefix}_LDFLAGS)
-+ if (flag MATCHES "^-L(.*)")
-+ list(APPEND _search_paths ${CMAKE_MATCH_1})
-+ continue()
-+ endif()
-+ if (flag MATCHES "^-l(.*)")
-+ set(_pkg_search "${CMAKE_MATCH_1}")
-+ else()
-+ continue()
-+ endif()
-+
-+ if(_search_paths)
-+ # Firstly search in -L paths
-+ find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
-+ NAMES ${_pkg_search}
-+ HINTS ${_search_paths} NO_DEFAULT_PATH)
-+ endif()
-+ find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
-+ NAMES ${_pkg_search}
-+ ${_find_opts})
-+ mark_as_advanced(pkgcfg_lib_${_prefix}_${_pkg_search})
-+ if(pkgcfg_lib_${_prefix}_${_pkg_search})
-+ list(APPEND _libs "${pkgcfg_lib_${_prefix}_${_pkg_search}}")
-+ else()
-+ list(APPEND _libs ${_pkg_search})
-+ endif()
-+ endforeach()
-+
-+ set(${_prefix}_LINK_LIBRARIES "${_libs}" PARENT_SCOPE)
-+endfunction()
-+
-+# create an imported target from all the information returned by pkg-config
-+function(_pkg_create_imp_target _prefix _imp_target_global)
-+ # only create the target if it is linkable, i.e. no executables
-+ if (NOT TARGET PkgConfig::${_prefix}
-+ AND ( ${_prefix}_INCLUDE_DIRS OR ${_prefix}_LINK_LIBRARIES OR ${_prefix}_LDFLAGS_OTHER OR ${_prefix}_CFLAGS_OTHER ))
-+ if(${_imp_target_global})
-+ set(_global_opt "GLOBAL")
-+ else()
-+ unset(_global_opt)
-+ endif()
-+ add_library(PkgConfig::${_prefix} INTERFACE IMPORTED ${_global_opt})
-+
-+ if(${_prefix}_INCLUDE_DIRS)
-+ set_property(TARGET PkgConfig::${_prefix} PROPERTY
-+ INTERFACE_INCLUDE_DIRECTORIES "${${_prefix}_INCLUDE_DIRS}")
-+ endif()
-+ if(${_prefix}_LINK_LIBRARIES)
-+ set_property(TARGET PkgConfig::${_prefix} PROPERTY
-+ INTERFACE_LINK_LIBRARIES "${${_prefix}_LINK_LIBRARIES}")
-+ endif()
-+ if(${_prefix}_LDFLAGS_OTHER)
-+ set_property(TARGET PkgConfig::${_prefix} PROPERTY
-+ INTERFACE_LINK_OPTIONS "${${_prefix}_LDFLAGS_OTHER}")
-+ endif()
-+ if(${_prefix}_CFLAGS_OTHER)
-+ set_property(TARGET PkgConfig::${_prefix} PROPERTY
-+ INTERFACE_COMPILE_OPTIONS "${${_prefix}_CFLAGS_OTHER}")
-+ endif()
-+ endif()
-+endfunction()
-+
-+# recalculate the dynamic output
-+# this is a macro and not a function so the result of _pkg_find_libs is automatically propagated
-+macro(_pkg_recalculate _prefix _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
-+ _pkg_find_libs(${_prefix} ${_no_cmake_path} ${_no_cmake_environment_path})
-+ if(${_imp_target})
-+ _pkg_create_imp_target(${_prefix} ${_imp_target_global})
-+ endif()
-+endmacro()
-+
-+###
-+macro(_pkg_set_path_internal)
-+ set(_extra_paths)
-+
-+ if(NOT _no_cmake_path)
-+ _pkgconfig_add_extra_path(_extra_paths CMAKE_PREFIX_PATH)
-+ _pkgconfig_add_extra_path(_extra_paths CMAKE_FRAMEWORK_PATH)
-+ _pkgconfig_add_extra_path(_extra_paths CMAKE_APPBUNDLE_PATH)
-+ endif()
-+
-+ if(NOT _no_cmake_environment_path)
-+ _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_PREFIX_PATH)
-+ _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_FRAMEWORK_PATH)
-+ _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_APPBUNDLE_PATH)
-+ endif()
-+
-+ if(NOT _extra_paths STREQUAL "")
-+ # Save the PKG_CONFIG_PATH environment variable, and add paths
-+ # from the CMAKE_PREFIX_PATH variables
-+ set(_pkgconfig_path_old "$ENV{PKG_CONFIG_PATH}")
-+ set(_pkgconfig_path "${_pkgconfig_path_old}")
-+ if(NOT _pkgconfig_path STREQUAL "")
-+ file(TO_CMAKE_PATH "${_pkgconfig_path}" _pkgconfig_path)
-+ endif()
-+
-+ # Create a list of the possible pkgconfig subfolder (depending on
-+ # the system
-+ set(_lib_dirs)
-+ if(NOT DEFINED CMAKE_SYSTEM_NAME
-+ OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
-+ AND NOT CMAKE_CROSSCOMPILING))
-+ if(EXISTS "/etc/debian_version") # is this a debian system ?
-+ if(CMAKE_LIBRARY_ARCHITECTURE)
-+ list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig")
-+ endif()
-+ else()
-+ # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties
-+ get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
-+ if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-+ list(APPEND _lib_dirs "lib32/pkgconfig")
-+ endif()
-+ get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-+ if(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-+ list(APPEND _lib_dirs "lib64/pkgconfig")
-+ endif()
-+ get_property(uselibx32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS)
-+ if(uselibx32 AND CMAKE_INTERNAL_PLATFORM_ABI STREQUAL "ELF X32")
-+ list(APPEND _lib_dirs "libx32/pkgconfig")
-+ endif()
-+ endif()
-+ endif()
-+ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_CROSSCOMPILING)
-+ list(APPEND _lib_dirs "libdata/pkgconfig")
-+ endif()
-+ list(APPEND _lib_dirs "lib/pkgconfig")
-+ list(APPEND _lib_dirs "share/pkgconfig")
-+
-+ # Check if directories exist and eventually append them to the
-+ # pkgconfig path list
-+ foreach(_prefix_dir ${_extra_paths})
-+ foreach(_lib_dir ${_lib_dirs})
-+ if(EXISTS "${_prefix_dir}/${_lib_dir}")
-+ list(APPEND _pkgconfig_path "${_prefix_dir}/${_lib_dir}")
-+ list(REMOVE_DUPLICATES _pkgconfig_path)
-+ endif()
-+ endforeach()
-+ endforeach()
-+
-+ # Prepare and set the environment variable
-+ if(NOT _pkgconfig_path STREQUAL "")
-+ # remove empty values from the list
-+ list(REMOVE_ITEM _pkgconfig_path "")
-+ file(TO_NATIVE_PATH "${_pkgconfig_path}" _pkgconfig_path)
-+ if(UNIX)
-+ string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
-+ string(REPLACE "\\ " " " _pkgconfig_path "${_pkgconfig_path}")
-+ endif()
-+ set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path}")
-+ endif()
-+
-+ # Unset variables
-+ unset(_lib_dirs)
-+ unset(_pkgconfig_path)
-+ endif()
-+endmacro()
-+
-+macro(_pkg_restore_path_internal)
-+ if(NOT _extra_paths STREQUAL "")
-+ # Restore the environment variable
-+ set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path_old}")
-+ endif()
-+
-+ unset(_extra_paths)
-+ unset(_pkgconfig_path_old)
-+endmacro()
-
- ###
--macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
-+macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global _prefix)
- _pkgconfig_unset(${_prefix}_FOUND)
- _pkgconfig_unset(${_prefix}_VERSION)
- _pkgconfig_unset(${_prefix}_PREFIX)
- _pkgconfig_unset(${_prefix}_INCLUDEDIR)
- _pkgconfig_unset(${_prefix}_LIBDIR)
-+ _pkgconfig_unset(${_prefix}_MODULE_NAME)
- _pkgconfig_unset(${_prefix}_LIBS)
- _pkgconfig_unset(${_prefix}_LIBS_L)
- _pkgconfig_unset(${_prefix}_LIBS_PATHS)
-@@ -193,83 +392,77 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
- # give out status message telling checked module
- if (NOT ${_is_silent})
- if (_pkg_check_modules_cnt EQUAL 1)
-- message(STATUS "checking for module '${_pkg_check_modules_list}'")
-- else(_pkg_check_modules_cnt EQUAL 1)
-- message(STATUS "checking for modules '${_pkg_check_modules_list}'")
-- endif(_pkg_check_modules_cnt EQUAL 1)
-- endif(NOT ${_is_silent})
-+ message(STATUS "Checking for module '${_pkg_check_modules_list}'")
-+ else()
-+ message(STATUS "Checking for modules '${_pkg_check_modules_list}'")
-+ endif()
-+ endif()
-
- set(_pkg_check_modules_packages)
- set(_pkg_check_modules_failed)
-
-+ _pkg_set_path_internal()
-+
- # iterate through module list and check whether they exist and match the required version
- foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
- set(_pkg_check_modules_exist_query)
-
- # check whether version is given
-- if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-- string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
-- string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}")
-- string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}")
-- else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-+ if (_pkg_check_modules_pkg MATCHES "(.*[^><])(=|[><]=?)(.*)")
-+ set(_pkg_check_modules_pkg_name "${CMAKE_MATCH_1}")
-+ set(_pkg_check_modules_pkg_op "${CMAKE_MATCH_2}")
-+ set(_pkg_check_modules_pkg_ver "${CMAKE_MATCH_3}")
-+ else()
- set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
- set(_pkg_check_modules_pkg_op)
- set(_pkg_check_modules_pkg_ver)
-- endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
--
-- # handle the operands
-- if (_pkg_check_modules_pkg_op STREQUAL ">=")
-- list(APPEND _pkg_check_modules_exist_query --atleast-version)
-- endif(_pkg_check_modules_pkg_op STREQUAL ">=")
--
-- if (_pkg_check_modules_pkg_op STREQUAL "=")
-- list(APPEND _pkg_check_modules_exist_query --exact-version)
-- endif(_pkg_check_modules_pkg_op STREQUAL "=")
--
-- if (_pkg_check_modules_pkg_op STREQUAL "<=")
-- list(APPEND _pkg_check_modules_exist_query --max-version)
-- endif(_pkg_check_modules_pkg_op STREQUAL "<=")
--
-- # create the final query which is of the format:
-- # * --atleast-version <version> <pkg-name>
-- # * --exact-version <version> <pkg-name>
-- # * --max-version <version> <pkg-name>
-- # * --exists <pkg-name>
-- if (_pkg_check_modules_pkg_op)
-- list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}")
-- else(_pkg_check_modules_pkg_op)
-- list(APPEND _pkg_check_modules_exist_query --exists)
-- endif(_pkg_check_modules_pkg_op)
-+ endif()
-
- _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION)
- _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX)
- _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR)
- _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR)
-
-- list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
- list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}")
-
-+ # create the final query which is of the format:
-+ # * <pkg-name> > <version>
-+ # * <pkg-name> >= <version>
-+ # * <pkg-name> = <version>
-+ # * <pkg-name> <= <version>
-+ # * <pkg-name> < <version>
-+ # * --exists <pkg-name>
-+ list(APPEND _pkg_check_modules_exist_query --print-errors --short-errors)
-+ if (_pkg_check_modules_pkg_op)
-+ list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name} ${_pkg_check_modules_pkg_op} ${_pkg_check_modules_pkg_ver}")
-+ else()
-+ list(APPEND _pkg_check_modules_exist_query --exists)
-+ list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
-+ endif()
-+
- # execute the query
- execute_process(
- COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query}
-- RESULT_VARIABLE _pkgconfig_retval)
-+ RESULT_VARIABLE _pkgconfig_retval
-+ ERROR_VARIABLE _pkgconfig_error
-+ ERROR_STRIP_TRAILING_WHITESPACE)
-
- # evaluate result and tell failures
- if (_pkgconfig_retval)
- if(NOT ${_is_silent})
-- message(STATUS " package '${_pkg_check_modules_pkg}' not found")
-- endif(NOT ${_is_silent})
-+ message(STATUS " ${_pkgconfig_error}")
-+ endif()
-
- set(_pkg_check_modules_failed 1)
-- endif(_pkgconfig_retval)
-- endforeach(_pkg_check_modules_pkg)
-+ endif()
-+ endforeach()
-
- if(_pkg_check_modules_failed)
- # fail when requested
- if (${_is_required})
-- message(SEND_ERROR "A required package was not found")
-- endif (${_is_required})
-- else(_pkg_check_modules_failed)
-+ message(FATAL_ERROR "A required package was not found")
-+ endif ()
-+ else()
- # when we are here, we checked whether requested modules
- # exist. Now, go through them and set variables
-
-@@ -281,17 +474,23 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
- # handle case when there is only one package required
- if (pkg_count EQUAL 1)
- set(_pkg_check_prefix "${_prefix}")
-- else(pkg_count EQUAL 1)
-+ else()
- set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
-- endif(pkg_count EQUAL 1)
-+ endif()
-
- _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion )
-- _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix )
-- _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir )
-- _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir )
--
-- message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
-- endforeach(_pkg_check_modules_pkg)
-+ pkg_get_variable("${_pkg_check_prefix}_PREFIX" ${_pkg_check_modules_pkg} "prefix")
-+ pkg_get_variable("${_pkg_check_prefix}_INCLUDEDIR" ${_pkg_check_modules_pkg} "includedir")
-+ pkg_get_variable("${_pkg_check_prefix}_LIBDIR" ${_pkg_check_modules_pkg} "libdir")
-+ foreach (variable IN ITEMS PREFIX INCLUDEDIR LIBDIR)
-+ _pkgconfig_set("${_pkg_check_prefix}_${variable}" "${${_pkg_check_prefix}_${variable}}")
-+ endforeach ()
-+ _pkgconfig_set("${_pkg_check_prefix}_MODULE_NAME" "${_pkg_check_modules_pkg}")
-+
-+ if (NOT ${_is_silent})
-+ message(STATUS " Found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
-+ endif ()
-+ endforeach()
-
- # set variables which are combined for multiple modules
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l )
-@@ -302,58 +501,271 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I )
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags )
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other )
-- endif(_pkg_check_modules_failed)
-- else(PKG_CONFIG_EXECUTABLE)
-+
-+ _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
-+ endif()
-+
-+ _pkg_restore_path_internal()
-+ else()
- if (${_is_required})
- message(SEND_ERROR "pkg-config tool not found")
-- endif (${_is_required})
-- endif(PKG_CONFIG_EXECUTABLE)
--endmacro(_pkg_check_modules_internal)
-+ endif ()
-+ endif()
-+endmacro()
-+
-+
-+#[========================================[.rst:
-+.. command:: pkg_check_modules
-+
-+ Checks for all the given modules, setting a variety of result variables in
-+ the calling scope.
-+
-+ .. code-block:: cmake
-+
-+ pkg_check_modules(<prefix>
-+ [REQUIRED] [QUIET]
-+ [NO_CMAKE_PATH]
-+ [NO_CMAKE_ENVIRONMENT_PATH]
-+ [IMPORTED_TARGET [GLOBAL]]
-+ <moduleSpec> [<moduleSpec>...])
-+
-+ When the ``REQUIRED`` argument is given, the command will fail with an error
-+ if module(s) could not be found.
-
--###
--### User visible macros start here
--###
-+ When the ``QUIET`` argument is given, no status messages will be printed.
-+
-+ By default, if :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` is 3.1 or
-+ later, or if :variable:`PKG_CONFIG_USE_CMAKE_PREFIX_PATH` is set to a
-+ boolean ``True`` value, then the :variable:`CMAKE_PREFIX_PATH`,
-+ :variable:`CMAKE_FRAMEWORK_PATH`, and :variable:`CMAKE_APPBUNDLE_PATH` cache
-+ and environment variables will be added to the ``pkg-config`` search path.
-+ The ``NO_CMAKE_PATH`` and ``NO_CMAKE_ENVIRONMENT_PATH`` arguments
-+ disable this behavior for the cache variables and environment variables
-+ respectively.
-+
-+ The ``IMPORTED_TARGET`` argument will create an imported target named
-+ ``PkgConfig::<prefix>`` that can be passed directly as an argument to
-+ :command:`target_link_libraries`. The ``GLOBAL`` argument will make the
-+ imported target available in global scope.
-+
-+ Each ``<moduleSpec>`` can be either a bare module name or it can be a
-+ module name with a version constraint (operators ``=``, ``<``, ``>``,
-+ ``<=`` and ``>=`` are supported). The following are examples for a module
-+ named ``foo`` with various constraints:
-+
-+ - ``foo`` matches any version.
-+ - ``foo<2`` only matches versions before 2.
-+ - ``foo>=3.1`` matches any version from 3.1 or later.
-+ - ``foo=1.2.3`` requires that foo must be exactly version 1.2.3.
-+
-+ The following variables may be set upon return. Two sets of values exist:
-+ One for the common case (``<XXX> = <prefix>``) and another for the
-+ information ``pkg-config`` provides when called with the ``--static``
-+ option (``<XXX> = <prefix>_STATIC``).
-+
-+ ``<XXX>_FOUND``
-+ set to 1 if module(s) exist
-+ ``<XXX>_LIBRARIES``
-+ only the libraries (without the '-l')
-+ ``<XXX>_LINK_LIBRARIES``
-+ the libraries and their absolute paths
-+ ``<XXX>_LIBRARY_DIRS``
-+ the paths of the libraries (without the '-L')
-+ ``<XXX>_LDFLAGS``
-+ all required linker flags
-+ ``<XXX>_LDFLAGS_OTHER``
-+ all other linker flags
-+ ``<XXX>_INCLUDE_DIRS``
-+ the '-I' preprocessor flags (without the '-I')
-+ ``<XXX>_CFLAGS``
-+ all required cflags
-+ ``<XXX>_CFLAGS_OTHER``
-+ the other compiler flags
-+
-+ All but ``<XXX>_FOUND`` may be a :ref:`;-list <CMake Language Lists>` if the
-+ associated variable returned from ``pkg-config`` has multiple values.
-+
-+ There are some special variables whose prefix depends on the number of
-+ ``<moduleSpec>`` given. When there is only one ``<moduleSpec>``,
-+ ``<YYY>`` will simply be ``<prefix>``, but if two or more ``<moduleSpec>``
-+ items are given, ``<YYY>`` will be ``<prefix>_<moduleName>``.
-+
-+ ``<YYY>_VERSION``
-+ version of the module
-+ ``<YYY>_PREFIX``
-+ prefix directory of the module
-+ ``<YYY>_INCLUDEDIR``
-+ include directory of the module
-+ ``<YYY>_LIBDIR``
-+ lib directory of the module
-+
-+ Examples:
-+
-+ .. code-block:: cmake
-+
-+ pkg_check_modules (GLIB2 glib-2.0)
-+
-+ Looks for any version of glib2. If found, the output variable
-+ ``GLIB2_VERSION`` will hold the actual version found.
-+
-+ .. code-block:: cmake
-+
-+ pkg_check_modules (GLIB2 glib-2.0>=2.10)
-
--###
-+ Looks for at least version 2.10 of glib2. If found, the output variable
-+ ``GLIB2_VERSION`` will hold the actual version found.
-+
-+ .. code-block:: cmake
-+
-+ pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0)
-+
-+ Looks for both glib2-2.0 (at least version 2.10) and any version of
-+ gtk2+-2.0. Only if both are found will ``FOO`` be considered found.
-+ The ``FOO_glib-2.0_VERSION`` and ``FOO_gtk+-2.0_VERSION`` variables will be
-+ set to their respective found module versions.
-+
-+ .. code-block:: cmake
-+
-+ pkg_check_modules (XRENDER REQUIRED xrender)
-+
-+ Requires any version of ``xrender``. Example output variables set by a
-+ successful call::
-+
-+ XRENDER_LIBRARIES=Xrender;X11
-+ XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
-+#]========================================]
- macro(pkg_check_modules _prefix _module0)
-+ _pkgconfig_parse_options(_pkg_modules _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global "${_module0}" ${ARGN})
- # check cached value
-- if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-- _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN})
-- _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules})
-+ if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND OR
-+ (NOT "${ARGN}" STREQUAL "" AND NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0};${ARGN}") OR
-+ ( "${ARGN}" STREQUAL "" AND NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0}"))
-+ _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" ${_pkg_modules})
-
- _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-- endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
--endmacro(pkg_check_modules)
-+ if (${_prefix}_FOUND)
-+ _pkgconfig_set(__pkg_config_arguments_${_prefix} "${_module0};${ARGN}")
-+ endif()
-+ else()
-+ if (${_prefix}_FOUND)
-+ _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
-+ endif()
-+ endif()
-+endmacro()
-
--###
-+
-+#[========================================[.rst:
-+.. command:: pkg_search_module
-+
-+ The behavior of this command is the same as :command:`pkg_check_modules`,
-+ except that rather than checking for all the specified modules, it searches
-+ for just the first successful match.
-+
-+ .. code-block:: cmake
-+
-+ pkg_search_module(<prefix>
-+ [REQUIRED] [QUIET]
-+ [NO_CMAKE_PATH]
-+ [NO_CMAKE_ENVIRONMENT_PATH]
-+ [IMPORTED_TARGET [GLOBAL]]
-+ <moduleSpec> [<moduleSpec>...])
-+
-+ If a module is found, the ``<prefix>_MODULE_NAME`` variable will contain the
-+ name of the matching module. This variable can be used if you need to run
-+ :command:`pkg_get_variable`.
-+
-+ Example:
-+
-+ .. code-block:: cmake
-+
-+ pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2)
-+#]========================================]
- macro(pkg_search_module _prefix _module0)
-+ _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global "${_module0}" ${ARGN})
- # check cached value
- if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
- set(_pkg_modules_found 0)
-- _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN})
-
-- message(STATUS "checking for one of the modules '${_pkg_modules_alt}'")
-+ if (NOT ${_pkg_is_silent})
-+ message(STATUS "Checking for one of the modules '${_pkg_modules_alt}'")
-+ endif ()
-
- # iterate through all modules and stop at the first working one.
- foreach(_pkg_alt ${_pkg_modules_alt})
- if(NOT _pkg_modules_found)
-- _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}")
-- endif(NOT _pkg_modules_found)
-+ _pkg_check_modules_internal(0 1 ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" "${_pkg_alt}")
-+ endif()
-
- if (${_prefix}_FOUND)
- set(_pkg_modules_found 1)
-- endif(${_prefix}_FOUND)
-- endforeach(_pkg_alt)
-+ break()
-+ endif()
-+ endforeach()
-
- if (NOT ${_prefix}_FOUND)
- if(${_pkg_is_required})
- message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
-- endif(${_pkg_is_required})
-- endif(NOT ${_prefix}_FOUND)
-+ endif()
-+ endif()
-
- _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-- endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
--endmacro(pkg_search_module)
-+ elseif (${_prefix}_FOUND)
-+ _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
-+ endif()
-+endmacro()
-+
-+#[========================================[.rst:
-+.. command:: pkg_get_variable
-+
-+ Retrieves the value of a pkg-config variable ``varName`` and stores it in the
-+ result variable ``resultVar`` in the calling scope.
-+
-+ .. code-block:: cmake
-+
-+ pkg_get_variable(<resultVar> <moduleName> <varName>)
-+
-+ If ``pkg-config`` returns multiple values for the specified variable,
-+ ``resultVar`` will contain a :ref:`;-list <CMake Language Lists>`.
-+
-+ For example:
-+
-+ .. code-block:: cmake
-+
-+ pkg_get_variable(GI_GIRDIR gobject-introspection-1.0 girdir)
-+#]========================================]
-+function (pkg_get_variable result pkg variable)
-+ _pkg_set_path_internal()
-+ _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
-+ set("${result}"
-+ "${prefix_result}"
-+ PARENT_SCOPE)
-+ _pkg_restore_path_internal()
-+endfunction ()
-+
-+
-+#[========================================[.rst:
-+Variables Affecting Behavior
-+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+
-+.. variable:: PKG_CONFIG_EXECUTABLE
-+
-+ This can be set to the path of the pkg-config executable. If not provided,
-+ it will be set by the module as a result of calling :command:`find_program`
-+ internally. The ``PKG_CONFIG`` environment variable can be used as a hint.
-+
-+.. variable:: PKG_CONFIG_USE_CMAKE_PREFIX_PATH
-+
-+ Specifies whether :command:`pkg_check_modules` and
-+ :command:`pkg_search_module` should add the paths in the
-+ :variable:`CMAKE_PREFIX_PATH`, :variable:`CMAKE_FRAMEWORK_PATH` and
-+ :variable:`CMAKE_APPBUNDLE_PATH` cache and environment variables to the
-+ ``pkg-config`` search path.
-+
-+ If this variable is not set, this behavior is enabled by default if
-+ :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` is 3.1 or later, disabled
-+ otherwise.
-+#]========================================]
-+
-
- ### Local Variables:
- ### mode: cmake
---
-2.24.0
-
-
-From 6595743466a2f1f25cae3cc8ccdeb9e3ca509265 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz at archlinux.org>
-Date: Sun, 10 Nov 2019 10:24:25 -0500
-Subject: [PATCH 2/3] python: use more idiomatic cmake pkg-config linking
-
-cmake documentation is absolutely atrocious, and I don't know why they
-mention all the wrong things to use, and the cargo cult of successfully
-writing a cmake build definition (copy-pasting what works from other
-projects) also uses all the wrong things. But it turns out it is
-possible to correctly link a PkgConfig target despite all that, at
-least, *iff* you use cmake >= 3.13. I've chosen option 2, which is to
-vendor in cmake >= 3.13's FindPkgConfig module in the previous commit.
-
-Using IMPORTED_TARGET GLOBAL in a pkg-config check will result in a
-proper linker target being created. For comparison, this is like using
-meson's dependency() target, except meson forces you to do this by
-default. The result is that the build system's internal representation
-of how to link something, is used instead of manually passing build
-flags defined in variables.
-
-This is an important distinction to make, because cmake does not have a
-list datatype, and instead turns lists into strings separated by ';'
-which are indistinguishable from, like, strings which contain ';'
-characters. When you pass the resulting list-which-isn't-really-a-list
-to link an executable/library, you either need to preprocess the
-variable to replace ';' with ' ' (just in case there are multiple
-elements) or use cmake functions which magically know to do this
-themselves -- or at least, I assume there are cmake functions that
-correctly handle so-called "lists", or there would be no need for
-"lists" to exist.
-
-The IMPORTED_TARGET will define a bunch of INTERFACE_* properties which
-do seem to do exactly this. The resulting build definition should
-actually, correctly, link python, thereby fixing #1398 in a better way.
----
- cmake/FindPython.cmake | 4 ++--
- src/plugins/python/CMakeLists.txt | 9 +--------
- 2 files changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake
-index 2e71e4c57..9e68d867b 100644
---- a/cmake/FindPython.cmake
-+++ b/cmake/FindPython.cmake
-@@ -31,7 +31,7 @@
- include(FindPkgConfig)
-
- if(ENABLE_PYTHON2)
-- pkg_check_modules(PYTHON python2)
-+ pkg_check_modules(PYTHON python2 IMPORTED_TARGET GLOBAL)
- else()
-- pkg_check_modules(PYTHON python3)
-+ pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL)
- endif()
-diff --git a/src/plugins/python/CMakeLists.txt b/src/plugins/python/CMakeLists.txt
-index 2229e551a..5a963efed 100644
---- a/src/plugins/python/CMakeLists.txt
-+++ b/src/plugins/python/CMakeLists.txt
-@@ -23,14 +23,7 @@ weechat-python-api.c weechat-python-api.h)
- set_target_properties(python PROPERTIES PREFIX "")
-
- if(PYTHON_FOUND)
-- # There's a weird bug on FreeBSD: the value of PYTHON_LDFLAGS is
-- # "-L/usr/local/lib;-lpython3.6m" instead of "-L/usr/local/lib -lpython3.6m".
-- # This is a temporary hack to fix the value, waiting for a clean fix.
-- string(REPLACE ";" " " PYTHON_LDFLAGS "${PYTHON_LDFLAGS}")
--
-- include_directories(${PYTHON_INCLUDE_DIRS})
-- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PYTHON_LDFLAGS}")
-- target_link_libraries(python ${PYTHON_LIBRARIES} weechat_plugins_scripts coverage_config)
-+ target_link_libraries(python PkgConfig::PYTHON weechat_plugins_scripts coverage_config)
- endif()
-
- install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)
---
-2.24.0
-
-
-From 318cabf69208849d7c565b4981aca31dfabac513 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz at archlinux.org>
-Date: Sun, 10 Nov 2019 10:40:43 -0500
-Subject: [PATCH 3/3] build: support python 3.8
-
-In python 3.8, in order to link to -lpython3.8, you need to use the
-exported pkg-config interface 'python3-embed' (or 'python3-config --libs
---embed'), see https://bugs.python.org/issue36721 for details.
----
- cmake/FindPython.cmake | 5 ++++-
- configure.ac | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake
-index 9e68d867b..9c818c1d7 100644
---- a/cmake/FindPython.cmake
-+++ b/cmake/FindPython.cmake
-@@ -33,5 +33,8 @@ include(FindPkgConfig)
- if(ENABLE_PYTHON2)
- pkg_check_modules(PYTHON python2 IMPORTED_TARGET GLOBAL)
- else()
-- pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL)
-+ pkg_check_modules(PYTHON python3-embed IMPORTED_TARGET GLOBAL)
-+ if(NOT PYTHON_FOUND)
-+ pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL)
-+ endif()
- endif()
-diff --git a/configure.ac b/configure.ac
-index ea014a988..e026789c3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -477,7 +477,10 @@ if test "x$enable_python" = "xyes" ; then
- if test "x$enable_python2" = "xyes" ; then
- PKG_CHECK_MODULES(PYTHON, [python2], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python2`], [PYTHON_FOUND=no])
- else
-- PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no])
-+ PKG_CHECK_MODULES(PYTHON, [python3-embed], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3-embed`], [PYTHON_FOUND=no])
-+ if test "x$PYTHON_FOUND" != "xyes"; then
-+ PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no])
-+ fi
- fi
- if test "x$PYTHON_FOUND" != "xyes" ; then
- AC_MSG_WARN([
---
-2.24.0
-
More information about the arch-commits
mailing list