zxing-cpp-cmake.patch

   1 --- zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10/CMakeLists.txt.orig      2019-03-20 14:52:05.000000000 +0100
   2 +++ zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10/CMakeLists.txt   2021-06-19 11:01:17.905319270 +0200
   3 @@ -44,21 +44,9 @@
   4      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
   5  endif()
   6
   7 -# OpenCV classes
   8 -find_package(OpenCV)
   9 -if(OpenCV_FOUND)
  10 -    list(APPEND LIBZXING_FILES
  11 -        opencv/src/zxing/MatSource.cpp
  12 -        opencv/src/zxing/MatSource.h
  13 -    )
  14 -
  15 -    include_directories(${OpenCV_INCLUDE_DIRS})
  16 -    include_directories(opencv/src)
  17 -endif()
  18 -
  19  include_directories(core/src)
  20  add_library(libzxing ${LIBZXING_FILES})
  21 -set_target_properties(libzxing PROPERTIES PREFIX "")
  22 +set_target_properties(libzxing PROPERTIES PREFIX "" SOVERSION 0)
  23
  24  find_package(Iconv)
  25  if(ICONV_FOUND)
  26 @@ -68,14 +56,32 @@
  27      add_definitions(-DNO_ICONV=1)
  28  endif()
  29
  30 -# Add OpenCV cli executable
  31 +# OpenCV classes
  32 +find_package(OpenCV)
  33  if(OpenCV_FOUND)
  34 +    file(GLOB_RECURSE LIBZXING_OPENCV_FILES
  35 +        "./opencv/src/*.cpp"
  36 +        "./opencv/src/*.h"
  37 +    )
  38 +    include_directories(${OpenCV_INCLUDE_DIRS})
  39 +    include_directories("./opencv/src/")
  40 +    add_library(libzxing-cv ${LIBZXING_OPENCV_FILES})
  41 +    set_target_properties(libzxing-cv PROPERTIES PREFIX "" SOVERSION 0)
  42 +    set(LIBZXING_FILES ${LIBZXING_FILES} ${LIBZXING_OPENCV_FILES})
  43 +    target_link_libraries(libzxing-cv libzxing ${OpenCV_LIBRARIES})
  44 +
  45 +    # Add OpenCV cli executable
  46      file(GLOB_RECURSE OPENCV_ZXING_FILES
  47          "./opencv-cli/src/*.cpp"
  48          "./opencv-cli/src/*.h"
  49      )
  50      add_executable(zxing-cv ${OPENCV_ZXING_FILES})
  51 -    target_link_libraries(zxing-cv libzxing ${OpenCV_LIBRARIES})
  52 +    target_link_libraries(zxing-cv libzxing-cv libzxing ${OpenCV_LIBRARIES})
  53 +
  54 +    install(TARGETS libzxing-cv zxing-cv
  55 +       LIBRARY DESTINATION lib${LIB_SUFFIX}
  56 +       RUNTIME DESTINATION bin
  57 +       ARCHIVE DESTINATION lib${LIB_SUFFIX})
  58  endif()
  59
  60  # Add cli executable.
  61 @@ -88,13 +94,13 @@
  62  target_link_libraries(zxing libzxing)
  63
  64  install(TARGETS zxing libzxing EXPORT zxing-targets
  65 -       LIBRARY DESTINATION lib
  66 +       LIBRARY DESTINATION lib${LIB_SUFFIX}
  67         RUNTIME DESTINATION bin
  68 -       ARCHIVE DESTINATION lib
  69 +       ARCHIVE DESTINATION lib${LIB_SUFFIX}
  70      INCLUDES DESTINATION include
  71  )
  72
  73 -install(EXPORT zxing-targets DESTINATION lib/zxing/cmake NAMESPACE zxing::)
  74 +install(EXPORT zxing-targets DESTINATION lib${LIB_SUFFIX}/zxing/cmake NAMESPACE zxing::)
  75
  76  install(
  77      DIRECTORY core/src/zxing/
  78 @@ -114,7 +120,7 @@
  79  endif()
  80
  81  configure_file(cmake/zxing-config.cmake.in zxing-config.cmake @ONLY)
  82 -install(FILES ${CMAKE_BINARY_DIR}/zxing-config.cmake DESTINATION lib/zxing/cmake)
  83 +install(FILES ${CMAKE_BINARY_DIR}/zxing-config.cmake DESTINATION lib${LIB_SUFFIX}/zxing/cmake)
  84
  85  if(BUILD_TESTING)
  86      # Add testrunner executable.