Merge pull request #7741 from alalek:cmake_remove_legacy_pkgconfig

2af4dc72 · Vadim Pisarevsky · 5cead190 · e5041abe · 2af4dc72 · 5cead190
Commit 2af4dc72 authored Nov 28, 2016 by Vadim Pisarevsky
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

CMakeLists.txt CMakeLists.txt +0 -4

OpenCVFindPkgConfig.cmake cmake/OpenCVFindPkgConfig.cmake +0 -0

OpenCVUtils.cmake cmake/OpenCVUtils.cmake +7 -0

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -447,10 +447,6 @@ endif(WIN32 AND NOT MINGW)
 #       CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
 # ----------------------------------------------------------------------------
 if(UNIX)
-  include(cmake/OpenCVFindPkgConfig.cmake OPTIONAL)
-  include(CheckFunctionExists)
-  include(CheckIncludeFile)
-
  if(NOT APPLE)
    CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
    if(ANDROID)

--- a/cmake/OpenCVFindPkgConfig.cmake
+++ b/cmake/OpenCVFindPkgConfig.cmake
--- a/cmake/OpenCVUtils.cmake
+++ b/cmake/OpenCVUtils.cmake
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+
+if(UNIX)
+  find_package(PkgConfig)
+endif()
+
 # Search packages for host system instead of packages for target system
 # in case of cross compilation thess macro should be defined by toolchain file
 if(NOT COMMAND find_host_package)