Skip to content

Commit 92a015b

Browse files
committed
Merge pull request opencv#12897 from alalek:cmake_deprecate_pkgconfig_3.4
2 parents cdaca22 + 73f65b1 commit 92a015b

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ OCV_OPTION(ENABLE_BUILD_HARDENING "Enable hardening of the resulting binarie
342342
OCV_OPTION(ENABLE_LTO "Enable Link Time Optimization" OFF IF CV_GCC OR MSVC)
343343
OCV_OPTION(ENABLE_THIN_LTO "Enable Thin LTO" OFF IF CV_CLANG)
344344
OCV_OPTION(GENERATE_ABI_DESCRIPTOR "Generate XML file for abi_compliance_checker tool" OFF IF UNIX)
345+
OCV_OPTION(OPENCV_GENERATE_PKGCONFIG "Generate .pc file for pkg-config build tool (deprecated)" ON IF (UNIX AND NOT MSVC AND NOT IOS AND NOT ANDROID) )
345346
OCV_OPTION(CV_ENABLE_INTRINSICS "Use intrinsic-based optimized code" ON )
346347
OCV_OPTION(CV_DISABLE_OPTIMIZATION "Disable explicit optimized code (dispatched code/intrinsics/loop unrolling/etc)" OFF )
347348
OCV_OPTION(CV_TRACE "Enable OpenCV code trace" ON)
@@ -859,6 +860,7 @@ include(cmake/OpenCVGenHeaders.cmake)
859860

860861
# Generate opencv.pc for pkg-config command
861862
if(NOT OPENCV_SKIP_PKGCONFIG_GENERATION
863+
AND OPENCV_GENERATE_PKGCONFIG
862864
AND NOT CMAKE_GENERATOR MATCHES "Xcode")
863865
include(cmake/OpenCVGenPkgconfig.cmake)
864866
endif()

0 commit comments

Comments
 (0)