0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch 1.3 KB

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