vcpkg/ports/zxing-cpp/0002-improve-features.patch

40 lines
1.2 KiB
Diff
Raw Normal View History

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ade734..54071bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.0)
project(zxing)
set(CMAKE_CXX_STANDARD 11)
option(BUILD_TESTING "Enable generation of test targets" OFF)
+option(WITH_OPENCV "Build with opencv" OFF)
+option(WITH_ICONV "Build with iconv" OFF)
set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH})
@@ -43,8 +45,8 @@ if(WIN32)
endif()
# OpenCV classes
-find_package(OpenCV)
-if(OpenCV_FOUND)
+if(WITH_OPENCV)
+ find_package(OpenCV REQUIRED)
list(APPEND LIBZXING_FILES
opencv/src/zxing/MatSource.cpp
opencv/src/zxing/MatSource.h
@@ -58,10 +60,10 @@ include_directories(core/src)
add_library(libzxing ${LIBZXING_FILES})
set_target_properties(libzxing PROPERTIES PREFIX "")
-find_package(Iconv)
-if(ICONV_FOUND)
- include_directories(${ICONV_INCLUDE_DIR})
- target_link_libraries(libzxing ${ICONV_LIBRARIES})
+if(WITH_ICONV)
+ find_package(Iconv REQUIRED)
+ include_directories(${Iconv_INCLUDE_DIRS})
+ target_link_libraries(libzxing ${Iconv_LIBRARIES})
else()
add_definitions(-DNO_ICONV=1)
endif()