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
7afce8e0
Commit
7afce8e0
authored
Dec 12, 2015
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
world build: fix modules instantiation order
opencv_hal before opencv_world opencv_world before opencv_ts
parent
1836d41b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
OpenCVModule.cmake
cmake/OpenCVModule.cmake
+14
-2
No files found.
cmake/OpenCVModule.cmake
View file @
7afce8e0
...
...
@@ -305,9 +305,10 @@ macro(ocv_glob_modules)
set
(
OPENCV_INITIAL_PASS OFF PARENT_SCOPE
)
set
(
OPENCV_INITIAL_PASS OFF
)
if
(
${
BUILD_opencv_world
}
)
add_subdirectory
(
"
${
OPENCV_MODULE_opencv_world_LOCATION
}
"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/world"
)
foreach
(
m
${
OPENCV_MODULES_BUILD
}
)
if
(
NOT OPENCV_MODULE_
${
m
}
_IS_PART_OF_WORLD AND NOT
${
m
}
STREQUAL opencv_world
)
if
(
"
${
m
}
"
STREQUAL opencv_world
)
add_subdirectory
(
"
${
OPENCV_MODULE_opencv_world_LOCATION
}
"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/world"
)
elseif
(
NOT OPENCV_MODULE_
${
m
}
_IS_PART_OF_WORLD AND NOT
${
m
}
STREQUAL opencv_world
)
message
(
STATUS
"Processing module
${
m
}
..."
)
if
(
m MATCHES
"^opencv_"
)
string
(
REGEX REPLACE
"^opencv_"
""
__shortname
"
${
m
}
"
)
...
...
@@ -446,6 +447,17 @@ function(__ocv_resolve_dependencies)
list
(
APPEND deps_
${
m
}
${
d
}
)
set
(
has_changes ON
)
endif
()
if
(
BUILD_opencv_world
AND NOT
"
${
m
}
"
STREQUAL
"opencv_world"
AND NOT
"
${
m2
}
"
STREQUAL
"opencv_world"
AND OPENCV_MODULE_
${
m2
}
_IS_PART_OF_WORLD
AND NOT OPENCV_MODULE_
${
m
}
_IS_PART_OF_WORLD
)
if
(
NOT
(
";
${
deps_
${
m
}}
;"
MATCHES
";opencv_world;"
))
# message(STATUS " Transfer dependency opencv_world alias ${m2} to ${m}")
list
(
APPEND deps_
${
m
}
opencv_world
)
set
(
has_changes ON
)
endif
()
endif
()
endforeach
()
endif
()
endforeach
()
...
...
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