Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
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_contrib
Commits
18f1c023
Commit
18f1c023
authored
Dec 15, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge moved code from opencv/3.4
parents
b11fb781
aaf67d6f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
CMakeLists.txt
modules/cudev/test/CMakeLists.txt
+1
-1
CMakeLists.txt
modules/viz/CMakeLists.txt
+2
-2
No files found.
modules/cudev/test/CMakeLists.txt
View file @
18f1c023
...
...
@@ -16,7 +16,7 @@ if(OCV_DEPENDENCIES_FOUND)
ocv_cuda_filter_options
()
CUDA_ADD_EXECUTABLE
(
${
the_target
}
${
OPENCV_TEST_
${
the_module
}
_SOURCES
}
OPTIONS -std=c++11
)
ocv_target_link_libraries
(
${
the_target
}
LINK_
PRIVATE
ocv_target_link_libraries
(
${
the_target
}
PRIVATE
${
test_deps
}
${
OPENCV_LINKER_LIBS
}
${
CUDA_LIBRARIES
}
)
add_dependencies
(
opencv_tests
${
the_target
}
)
...
...
modules/viz/CMakeLists.txt
View file @
18f1c023
...
...
@@ -35,10 +35,10 @@ ocv_add_accuracy_tests()
ocv_add_perf_tests
()
ocv_add_samples
(
opencv_imgproc opencv_calib3d opencv_features2d opencv_flann
)
ocv_target_link_libraries
(
${
the_module
}
LINK_
PRIVATE
${
VTK_LIBRARIES
}
)
ocv_target_link_libraries
(
${
the_module
}
PRIVATE
${
VTK_LIBRARIES
}
)
if
(
APPLE AND BUILD_opencv_viz
)
ocv_target_link_libraries
(
${
the_module
}
LINK_
PRIVATE
"-framework Cocoa"
)
ocv_target_link_libraries
(
${
the_module
}
PRIVATE
"-framework Cocoa"
)
endif
()
if
(
TARGET opencv_test_viz
)
...
...
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