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
c41db69f
Commit
c41db69f
authored
Feb 18, 2015
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed cmake issues
parent
553020c4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
OpenCVModule.cmake
cmake/OpenCVModule.cmake
+4
-2
No files found.
cmake/OpenCVModule.cmake
View file @
c41db69f
...
@@ -663,7 +663,7 @@ macro(_ocv_create_module)
...
@@ -663,7 +663,7 @@ macro(_ocv_create_module)
set
(
sub_objs
""
)
set
(
sub_objs
""
)
set
(
sub_links
""
)
set
(
sub_links
""
)
set
(
cuda_objs
""
)
set
(
cuda_objs
""
)
if
(
DEFINED
OPENCV_MODULE_
${
the_module
}
_CHILDREN
)
if
(
OPENCV_MODULE_
${
the_module
}
_CHILDREN
)
status
(
"Complex module
${
the_module
}
"
)
status
(
"Complex module
${
the_module
}
"
)
foreach
(
m
${
OPENCV_MODULE_
${
the_module
}
_CHILDREN
}
)
foreach
(
m
${
OPENCV_MODULE_
${
the_module
}
_CHILDREN
}
)
if
(
BUILD_
${
m
}
AND TARGET
${
m
}
_object
)
# ambigous?
if
(
BUILD_
${
m
}
AND TARGET
${
m
}
_object
)
# ambigous?
...
@@ -765,7 +765,9 @@ macro(_ocv_create_module)
...
@@ -765,7 +765,9 @@ macro(_ocv_create_module)
if
(
TARGET
${
the_module
}
_object
)
if
(
TARGET
${
the_module
}
_object
)
# copy COMPILE_DEFINITIONS
# copy COMPILE_DEFINITIONS
get_target_property
(
main_defs
${
the_module
}
COMPILE_DEFINITIONS
)
get_target_property
(
main_defs
${
the_module
}
COMPILE_DEFINITIONS
)
set_target_properties
(
${
the_module
}
_object PROPERTIES COMPILE_DEFINITIONS
${
main_defs
}
)
if
(
main_defs
)
set_target_properties
(
${
the_module
}
_object PROPERTIES COMPILE_DEFINITIONS
${
main_defs
}
)
endif
()
# use same PCH
# use same PCH
if
(
TARGET pch_Generate_
${
the_module
}
)
if
(
TARGET pch_Generate_
${
the_module
}
)
add_dependencies
(
${
the_module
}
_object pch_Generate_
${
the_module
}
)
add_dependencies
(
${
the_module
}
_object pch_Generate_
${
the_module
}
)
...
...
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