projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cca99bf
)
cmake: disable generation of pkg-config file during Xcode build
author
Alexander Alekhin
<alexander.alekhin@intel.com>
Mon, 23 Oct 2017 09:31:20 +0000
(12:31 +0300)
committer
Alexander Alekhin
<alexander.alekhin@intel.com>
Mon, 23 Oct 2017 09:31:20 +0000
(12:31 +0300)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
47de63f
..
7294303
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-793,7
+793,8
@@
endif()
include(cmake/OpenCVGenHeaders.cmake)
# Generate opencv.pc for pkg-config command
-if(NOT OPENCV_SKIP_PKGCONFIG_GENERATION)
+if(NOT OPENCV_SKIP_PKGCONFIG_GENERATION
+ AND NOT CMAKE_GENERATOR MATCHES "Xcode")
include(cmake/OpenCVGenPkgconfig.cmake)
endif()