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
f99f58d9
Commit
f99f58d9
authored
Jun 10, 2019
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow setting IS_PART_OF_WORLD in command line, fix videoio plugin linking
parent
1aefa677
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
OpenCVModule.cmake
cmake/OpenCVModule.cmake
+1
-0
plugin.cmake
modules/videoio/cmake/plugin.cmake
+2
-2
No files found.
cmake/OpenCVModule.cmake
View file @
f99f58d9
...
@@ -185,6 +185,7 @@ macro(ocv_add_module _name)
...
@@ -185,6 +185,7 @@ macro(ocv_add_module _name)
# add self to the world dependencies
# add self to the world dependencies
if
((
NOT DEFINED OPENCV_MODULE_IS_PART_OF_WORLD
if
((
NOT DEFINED OPENCV_MODULE_IS_PART_OF_WORLD
AND NOT OPENCV_MODULE_
${
the_module
}
_CLASS STREQUAL
"BINDINGS"
AND NOT OPENCV_MODULE_
${
the_module
}
_CLASS STREQUAL
"BINDINGS"
AND
(
NOT DEFINED OPENCV_MODULE_
${
the_module
}
_IS_PART_OF_WORLD OR OPENCV_MODULE_
${
the_module
}
_IS_PART_OF_WORLD
)
AND
(
NOT OPENCV_PROCESSING_EXTRA_MODULES OR NOT OPENCV_WORLD_EXCLUDE_EXTRA_MODULES
)
AND
(
NOT OPENCV_PROCESSING_EXTRA_MODULES OR NOT OPENCV_WORLD_EXCLUDE_EXTRA_MODULES
)
AND
(
NOT BUILD_SHARED_LIBS OR NOT
"x
${
OPENCV_MODULE_TYPE
}
"
STREQUAL
"xSTATIC"
))
AND
(
NOT BUILD_SHARED_LIBS OR NOT
"x
${
OPENCV_MODULE_TYPE
}
"
STREQUAL
"xSTATIC"
))
OR OPENCV_MODULE_IS_PART_OF_WORLD
OR OPENCV_MODULE_IS_PART_OF_WORLD
...
...
modules/videoio/cmake/plugin.cmake
View file @
f99f58d9
...
@@ -21,8 +21,8 @@ function(ocv_create_builtin_videoio_plugin name target)
...
@@ -21,8 +21,8 @@ function(ocv_create_builtin_videoio_plugin name target)
target_link_libraries
(
${
name
}
PRIVATE
${
target
}
)
target_link_libraries
(
${
name
}
PRIVATE
${
target
}
)
foreach
(
mod opencv_videoio opencv_core opencv_imgproc opencv_imgcodecs
)
foreach
(
mod opencv_videoio opencv_core opencv_imgproc opencv_imgcodecs
)
target_link_libraries
(
${
name
}
PRIVATE
${
mod
}
)
ocv_target_link_libraries
(
${
name
}
LINK_
PRIVATE
${
mod
}
)
target_include_directories
(
${
name
}
PRIVATE
"
${
OPENCV_MODULE_
${
mod
}
_LOCATION
}
/include"
)
ocv_
target_include_directories
(
${
name
}
PRIVATE
"
${
OPENCV_MODULE_
${
mod
}
_LOCATION
}
/include"
)
endforeach
()
endforeach
()
set_target_properties
(
${
name
}
PROPERTIES
set_target_properties
(
${
name
}
PROPERTIES
...
...
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