Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
82be2d62
Commit
82be2d62
authored
Apr 26, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14430 from alalek:cmake_fix_include_pkgconfig_3.4
parents
b95fdc19
90c34c5c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
CMakeLists.txt
CMakeLists.txt
+1
-1
OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+1
-1
No files found.
CMakeLists.txt
View file @
82be2d62
...
...
@@ -720,7 +720,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
)
...
...
cmake/OpenCVUtils.cmake
View file @
82be2d62
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment