1From 9e5dfa57f3b998bc3049bfa893b20e81dea656df Mon Sep 17 00:00:00 2001 2From: Yuri <yuri@rawbw.com> 3Date: Sat, 20 Apr 2019 07:28:26 -0700 4Subject: [PATCH] Link library with OpenCV, not only the executable, make libs 5 PRIVATE. 6 7Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 8[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/86] 9--- 10 CMakeLists.txt | 7 ++++++- 11 1 file changed, 6 insertions(+), 1 deletion(-) 12 13diff --git a/CMakeLists.txt b/CMakeLists.txt 14index 738f4e1..efe3aee 100644 15--- a/CMakeLists.txt 16+++ b/CMakeLists.txt 17@@ -60,10 +60,12 @@ include_directories(core/src) 18 add_library(libzxing ${LIBZXING_FILES}) 19 set_target_properties(libzxing PROPERTIES PREFIX "") 20 21+set(libzxing_LIBS "") 22+ 23 find_package(Iconv) 24 if(ICONV_FOUND) 25 include_directories(${ICONV_INCLUDE_DIR}) 26- target_link_libraries(libzxing ${ICONV_LIBRARIES}) 27+ set(libzxing_LIBS ${libzxing_LIBS} ${ICONV_LIBRARIES}) 28 else() 29 add_definitions(-DNO_ICONV=1) 30 endif() 31@@ -75,9 +77,12 @@ if(OpenCV_FOUND) 32 "./opencv-cli/src/*.h" 33 ) 34 add_executable(zxing-cv ${OPENCV_ZXING_FILES}) 35+ set(libzxing_LIBS ${libzxing_LIBS} ${OpenCV_LIBRARIES}) 36 target_link_libraries(zxing-cv libzxing ${OpenCV_LIBRARIES}) 37 endif() 38 39+target_link_libraries(libzxing PRIVATE ${libzxing_LIBS}) 40+ 41 # Add cli executable. 42 file(GLOB_RECURSE ZXING_FILES 43 "./cli/src/*.cpp" 44