--- CMakeLists.txt.orig 2019-03-20 13:52:05 UTC +++ CMakeLists.txt @@ -45,7 +45,7 @@ else() endif() # OpenCV classes -find_package(OpenCV) +find_package(OpenCV REQUIRED core) if(OpenCV_FOUND) list(APPEND LIBZXING_FILES opencv/src/zxing/MatSource.cpp @@ -60,6 +60,11 @@ include_directories(core/src) add_library(libzxing ${LIBZXING_FILES}) set_target_properties(libzxing PROPERTIES PREFIX "") +if(OpenCV_FOUND) + target_link_libraries(libzxing ${OpenCV_LIBS}) +endif() + + find_package(Iconv) if(ICONV_FOUND) include_directories(${ICONV_INCLUDE_DIR}) @@ -69,13 +74,14 @@ else() endif() # Add OpenCV cli executable +find_package(OpenCV REQUIRED core imgproc highgui) if(OpenCV_FOUND) file(GLOB_RECURSE OPENCV_ZXING_FILES "./opencv-cli/src/*.cpp" "./opencv-cli/src/*.h" ) add_executable(zxing-cv ${OPENCV_ZXING_FILES}) - target_link_libraries(zxing-cv libzxing ${OpenCV_LIBRARIES}) + target_link_libraries(zxing-cv libzxing ${OpenCV_LIBS}) endif() # Add cli executable. @@ -85,7 +91,7 @@ file(GLOB_RECURSE ZXING_FILES ) add_executable(zxing ${ZXING_FILES}) -target_link_libraries(zxing libzxing) +target_link_libraries(zxing libzxing ${OpenCV_LIBRARIES}) install(TARGETS zxing libzxing EXPORT zxing-targets LIBRARY DESTINATION lib