diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-11 11:34:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-11 11:34:58 (GMT) |
| commit | 8d5ec219288b05379f19a23a0a0b4c8b76a17712 (patch) | |
| tree | d90084226f691815e5e01d98a3dae2817e0f6ccc /Modules | |
| parent | 8f63f3495d30c38a953ac234f5d34578f7668b70 (diff) | |
| parent | 3cf267cfbf740e8c8dc28f132fff5042c7201d3d (diff) | |
| download | CMake-8d5ec219288b05379f19a23a0a0b4c8b76a17712.zip CMake-8d5ec219288b05379f19a23a0a0b4c8b76a17712.tar.gz CMake-8d5ec219288b05379f19a23a0a0b4c8b76a17712.tar.bz2 | |
Merge topic 'FindPkgConfig-rerun'
3cf267cf FindPkgConfig: do not always rerun pkg_check_modules() with 2 arguments
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1036
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 a5357fa..8ac1691 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -584,7 +584,9 @@ endmacro() 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 "${_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 OR NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0};${ARGN}") + 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} "${_prefix}" ${_pkg_modules}) _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) |