Merge topic 'FindPkgConfig-version-ops'

8d71fa92 FindPkgConfig: use new version checking "library >= version" syntax

Modules/FindPkgConfig.cmake

@@ -360,38 +360,25 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
         set(_pkg_check_modules_pkg_ver)
       endif()
 
-      # handle the operands
-      if (_pkg_check_modules_pkg_op STREQUAL ">=")
-        list(APPEND _pkg_check_modules_exist_query --atleast-version)
-      endif()
-
-      if (_pkg_check_modules_pkg_op STREQUAL "=")
-        list(APPEND _pkg_check_modules_exist_query --exact-version)
-      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)
 
-      if (_pkg_check_modules_pkg_op STREQUAL "<=")
-        list(APPEND _pkg_check_modules_exist_query --max-version)
-      endif()
+      list(APPEND _pkg_check_modules_packages    "${_pkg_check_modules_pkg_name}")
 
       # create the final query which is of the format:
-      # * --atleast-version <version> <pkg-name>
-      # * --exact-version <version> <pkg-name>
-      # * --max-version <version> <pkg-name>
+      # * <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_ver}")
+        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()
-      list(APPEND _pkg_check_modules_exist_query --print-errors --short-errors)
-
-      _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}")
 
       # execute the query
       execute_process(

Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat

@@ -1,7 +1,11 @@
 @ECHO OFF
+
+:LOOP
+
 IF "%1"=="" (
   EXIT /B 255
 )
+
 IF "%1"=="--version" (
   ECHO 0.0-cmake-dummy
   EXIT /B 0
@@ -13,6 +17,11 @@ IF "%1"=="--exists" (
   ECHO Found:    %PKG_CONFIG_PATH%
   IF NOT "%*"=="%PKG_CONFIG_PATH%" (
     EXIT /B 1
+  ) ELSE (
+    EXIT /B 0
   )
 )
-EXIT /B 0
+SHIFT
+IF NOT "%~1"=="" GOTO LOOP
+
+EXIT /B 255

Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh

@@ -4,18 +4,20 @@
 # to the --exists argument with the PKG_CONFIG_PATH environment variable
 # and returns 1 if they are different.
 
-case $1 in
-  --version)
-    echo "0.0-cmake-dummy"
-    ;;
-  --exists)
-    shift
-    eval last=\${$#}
-    echo "Expected: ${last}"
-    echo "Found:    ${PKG_CONFIG_PATH}"
-    [ "${last}" = "${PKG_CONFIG_PATH}" ] || exit 1
-    ;;
-  *)
-    exit 255
-    ;;
-esac
+while [ $# -gt 0 ]; do
+  case $1 in
+    --version)
+      echo "0.0-cmake-dummy"
+      exit 0
+      ;;
+    --exists)
+      shift
+      eval last=\${$#}
+      echo "Expected: ${last}"
+      echo "Found:    ${PKG_CONFIG_PATH}"
+      [ "${last}" = "${PKG_CONFIG_PATH}" ] && exit 0 || exit 1
+      ;;
+  esac
+  shift
+done
+exit 255