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
24dbb43c
Commit
24dbb43c
authored
Dec 22, 2015
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pkg-config: modules list contains only OpenCV modules (fixes #5852)
parent
afdbd855
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+7
-4
No files found.
cmake/OpenCVUtils.cmake
View file @
24dbb43c
...
...
@@ -806,7 +806,13 @@ macro(ocv_get_all_libs _modules _extra _3rdparty)
else
()
set
(
deps
""
)
endif
()
list
(
INSERT
${
_modules
}
0
${
deps
}
${
m
}
)
set
(
_rev_deps
"
${
deps
}
;
${
m
}
"
)
ocv_list_reverse
(
_rev_deps
)
foreach
(
dep
${
_rev_deps
}
)
if
(
DEFINED OPENCV_MODULE_
${
dep
}
_LOCATION
)
list
(
INSERT
${
_modules
}
0
${
dep
}
)
endif
()
endforeach
()
foreach
(
dep
${
deps
}
${
OPENCV_LINKER_LIBS
}
)
if
(
NOT DEFINED OPENCV_MODULE_
${
dep
}
_LOCATION
)
if
(
TARGET
${
dep
}
)
...
...
@@ -832,9 +838,6 @@ macro(ocv_get_all_libs _modules _extra _3rdparty)
endif
()
endif
()
# split 3rdparty libs and modules
list
(
REMOVE_ITEM
${
_modules
}
${${
_3rdparty
}}
${${
_extra
}}
non_empty_list
)
ocv_list_filterout
(
${
_modules
}
"^[
\$
]<"
)
ocv_list_filterout
(
${
_3rdparty
}
"^[
\$
]<"
)
ocv_list_filterout
(
${
_extra
}
"^[
\$
]<"
)
...
...
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