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
0b33eb09
Commit
0b33eb09
authored
Dec 15, 2017
by
Alexander Alekhin
Committed by
Alexander Alekhin
Dec 15, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: fix ocv_target_compile_definitions() for world builds
fixes CUDA build
parent
8ed1a274
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
OpenCVModule.cmake
cmake/OpenCVModule.cmake
+5
-0
OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+7
-0
No files found.
cmake/OpenCVModule.cmake
View file @
0b33eb09
...
...
@@ -863,6 +863,11 @@ macro(_ocv_create_module)
ocv_target_link_libraries
(
${
the_module
}
LINK_PRIVATE
${
CUDA_LIBRARIES
}
${
CUDA_npp_LIBRARY
}
)
endif
()
if
(
OPENCV_MODULE_
${
the_module
}
_COMPILE_DEFINITIONS
)
target_compile_definitions
(
${
the_module
}
${
OPENCV_MODULE_
${
the_module
}
_COMPILE_DEFINITIONS
}
)
unset
(
OPENCV_MODULE_
${
the_module
}
_COMPILE_DEFINITIONS CACHE
)
endif
()
add_dependencies
(
opencv_modules
${
the_module
}
)
if
(
ENABLE_SOLUTION_FOLDERS
)
...
...
cmake/OpenCVUtils.cmake
View file @
0b33eb09
...
...
@@ -987,7 +987,14 @@ endfunction()
function
(
ocv_target_compile_definitions target
)
_ocv_fix_target
(
target
)
if
(
NOT TARGET
${
target
}
)
if
(
NOT DEFINED OPENCV_MODULE_
${
target
}
_LOCATION
)
message
(
FATAL_ERROR
"ocv_target_compile_definitions: invalid target: '
${
target
}
'"
)
endif
()
set
(
OPENCV_MODULE_
${
target
}
_COMPILE_DEFINITIONS
${
OPENCV_MODULE_
${
target
}
_COMPILE_DEFINITIONS
}
${
ARGN
}
CACHE INTERNAL
""
FORCE
)
else
()
target_compile_definitions
(
${
target
}
${
ARGN
}
)
endif
()
endfunction
()
...
...
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