Skip to content

Commit eb4243a

Browse files
authored
Merge pull request #3055 from traversaro/cleanupopencv
CMake: Use OpenCV_LIBS instead of OpenCV_LIBRARIES as documented in official OpenCV docs
2 parents cc2a18b + 12cd6e0 commit eb4243a

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

example/cmake/with_opencv/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ find_package(OpenCV REQUIRED)
2525
# add OpenCV include directories
2626
target_include_directories(foo PRIVATE ${OPENCV_INCLUDE_DIR})
2727
# link OpenCV libraries
28-
target_link_libraries(foo PRIVATE ${OPENCV_LIBRARIES}
28+
target_link_libraries(foo PRIVATE ${OpenCV_LIBS}

example/opencv/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ find_package(OpenCV REQUIRED)
1010

1111
add_executable(opencv_test)
1212
target_sources(opencv_test PRIVATE main.cpp)
13-
target_link_libraries(opencv_test PRIVATE ${YARP_LIBRARIES} ${OpenCV_LIBRARIES})
13+
target_link_libraries(opencv_test PRIVATE ${YARP_LIBRARIES} ${OpenCV_LIBS})

src/devices/opencv/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if(NOT SKIP_opencv_grabber)
3333
)
3434

3535
target_include_directories(yarp_opencv SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS})
36-
target_link_libraries(yarp_opencv PRIVATE ${OpenCV_LIBRARIES})
36+
target_link_libraries(yarp_opencv PRIVATE ${OpenCV_LIBS})
3737
# list(APPEND YARP_${YARP_PLUGIN_MASTER}_PRIVATE_DEPS OpenCV) (not using targets)
3838

3939
yarp_install(

src/devices/usbCamera/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if(ENABLE_usbCamera OR ENABLE_usbCameraRaw)
5353
# list(APPEND YARP_${YARP_PLUGIN_MASTER}_PRIVATE_DEPS Libv4lconvert) (not using targets)
5454

5555
target_include_directories(yarp_usbCamera SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS})
56-
target_link_libraries(yarp_usbCamera PRIVATE ${OpenCV_LIBRARIES})
56+
target_link_libraries(yarp_usbCamera PRIVATE ${OpenCV_LIBS})
5757
# list(APPEND YARP_${YARP_PLUGIN_MASTER}_PRIVATE_DEPS OpenCV) (not using targets)
5858

5959
yarp_install(

src/libYARP_cv/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
project(YARP_cv)
55

6-
# OpenCV is required, otherwise the OpenCV_INCLUDE_DIR and OpenCV_LIBRARIES
6+
# OpenCV is required, otherwise the OpenCV_INCLUDE_DIR and OpenCV_LIBS
77
# (used in the CMakeLists.txt file in the src direcrory) are not expanded).
88
# FIXME Remove this check when OpenCV targets will be used.
99
if (NOT YARP_HAS_OpenCV)

src/libYARP_cv/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ target_link_libraries(YARP_cv INTERFACE YARP::YARP_sig)
2626
list(APPEND YARP_cv_PUBLIC_DEPS YARP_sig)
2727

2828
target_include_directories(YARP_cv SYSTEM INTERFACE ${OpenCV_INCLUDE_DIRS})
29-
target_link_libraries(YARP_cv INTERFACE ${OpenCV_LIBRARIES})
29+
target_link_libraries(YARP_cv INTERFACE ${OpenCV_LIBS})
3030
list(APPEND YARP_cv_PUBLIC_DEPS OpenCV)
3131

3232
# set_property(TARGET YARP_cv PROPERTY PUBLIC_HEADER ${YARP_cv_HDRS})

src/portmonitors/image_rotation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ list(APPEND YARP_${YARP_PLUGIN_MASTER}_PRIVATE_DEPS
3131
)
3232

3333
target_include_directories(yarp_pm_image_rotation SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS})
34-
target_link_libraries(yarp_pm_image_rotation PRIVATE ${OpenCV_LIBRARIES})
34+
target_link_libraries(yarp_pm_image_rotation PRIVATE ${OpenCV_LIBS})
3535

3636
yarp_install(
3737
TARGETS yarp_pm_image_rotation

src/yarpdatadumper/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if(YARP_COMPILE_yarpdatadumper)
2222

2323
if(YARP_HAS_OpenCV)
2424
target_compile_definitions(yarpdatadumper PRIVATE ADD_VIDEO)
25-
target_link_libraries(yarpdatadumper PRIVATE ${OpenCV_LIBRARIES})
25+
target_link_libraries(yarpdatadumper PRIVATE ${OpenCV_LIBS})
2626
target_link_libraries(yarpdatadumper PRIVATE YARP::YARP_cv)
2727
endif()
2828

src/yarpdataplayer/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ if(YARP_COMPILE_yarpdataplayer)
117117
target_include_directories(yarpdataplayer PRIVATE ${OpenCV_INCLUDE_DIRS})
118118
target_link_libraries(yarpdataplayer
119119
PRIVATE
120-
${OpenCV_LIBRARIES}
120+
${OpenCV_LIBS}
121121
YARP::YARP_cv
122122
)
123123
endif()

src/yarplaserscannergui/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if(YARP_COMPILE_yarplaserscannergui)
6363
)
6464

6565
target_include_directories(yarplaserscannergui PRIVATE ${OpenCV_INCLUDE_DIRS})
66-
target_link_libraries(yarplaserscannergui PRIVATE ${OpenCV_LIBRARIES})
66+
target_link_libraries(yarplaserscannergui PRIVATE ${OpenCV_LIBS})
6767

6868
install(TARGETS yarplaserscannergui COMPONENT utilities DESTINATION ${CMAKE_INSTALL_BINDIR})
6969

0 commit comments

Comments
 (0)