diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-04 14:35:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-04 14:35:39 (GMT) |
| commit | a9ff6cefe5053d6536b4ea70baef19de4bfc0295 (patch) | |
| tree | 4ea4601f76269e69ce1c20df048a788f28c22135 /Modules | |
| parent | a9b442cdc76f794723a2aa8fbf8f19dff7325638 (diff) | |
| parent | aa51bfd74f906b5447b6243aac7e0dec08d5bc6d (diff) | |
| download | CMake-a9ff6cefe5053d6536b4ea70baef19de4bfc0295.zip CMake-a9ff6cefe5053d6536b4ea70baef19de4bfc0295.tar.gz CMake-a9ff6cefe5053d6536b4ea70baef19de4bfc0295.tar.bz2 | |
Merge branch 'pkgc-op-lt-gt' into release-3.13
Merge-request: !2435
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindPkgConfig.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 3934867..a96df99 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -397,7 +397,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma set(_pkg_check_modules_exist_query) # check whether version is given - if (_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}") @@ -415,9 +415,11 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma 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) |