mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 12:22:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14430 from alalek:cmake_fix_include_pkgconfig_3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2019-04-26 20:18:58 +00:00
commit 82be2d6210
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -720,7 +720,7 @@ ocv_cmake_hook(POST_COMPILER_OPTIONS)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
if(UNIX) if(UNIX)
if(NOT APPLE_FRAMEWORK OR OPENCV_ENABLE_PKG_CONFIG) 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 AND NOT OPENCV_ENABLE_PKG_CONFIG
) )
if(NOT PkgConfig_FOUND) if(NOT PkgConfig_FOUND)

2
cmake/OpenCVUtils.cmake
View File

@ -743,7 +743,7 @@ macro(ocv_check_modules define)
endif() endif()
unset(${define}_${__modname}_FOUND) unset(${define}_${__modname}_FOUND)
endforeach() endforeach()
if(COMMAND pkg_check_modules) if(PKG_CONFIG_FOUND OR PkgConfig_FOUND)
pkg_check_modules(${define} ${ARGN}) pkg_check_modules(${define} ${ARGN})
endif() endif()
if(${define}_FOUND) if(${define}_FOUND)