From 90c34c5c17ccb9f4b7cd5973cda58da67ca9262b Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 26 Apr 2019 15:13:16 +0300 Subject: [PATCH] cmake: fix pkg-config handling backporting commit c9f3f4d1d32ec065eb6431c7fbe78466e08a2fbe --- CMakeLists.txt | 2 +- cmake/OpenCVUtils.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 759de6ece6..4048378626 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -719,7 +719,7 @@ ocv_cmake_hook(POST_COMPILER_OPTIONS) # ---------------------------------------------------------------------------- if(UNIX) if(NOT APPLE_FRAMEWORK OR OPENCV_ENABLE_PKG_CONFIG) - if(CMAKE_CROSSCOMPILING AND NOT DEFINED ENV{PKG_CONFIG_LIBDIR} + if(CMAKE_CROSSCOMPILING AND NOT DEFINED ENV{PKG_CONFIG_LIBDIR} AND NOT DEFINED ENV{PKG_CONFIG_SYSROOT_DIR} AND NOT OPENCV_ENABLE_PKG_CONFIG ) if(NOT PkgConfig_FOUND) diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake index c530a4c983..f8ff242948 100644 --- a/cmake/OpenCVUtils.cmake +++ b/cmake/OpenCVUtils.cmake @@ -743,7 +743,7 @@ macro(ocv_check_modules define) endif() unset(${define}_${__modname}_FOUND) endforeach() - if(COMMAND pkg_check_modules) + if(PKG_CONFIG_FOUND OR PkgConfig_FOUND) pkg_check_modules(${define} ${ARGN}) endif() if(${define}_FOUND)