forked from pool/zxing-cpp
Jan Engelhardt
6cd1cc0565
* Fix ABI breakage from 2.2.0.
- Changes from 2.2.0:
* Rename DecodeHints to ReaderOptions. The old name is still available for
backward API compatibility but deprecated. Since the C-API and the Qt
wrapper code are not officially part of the library, they changed without
backward compatibility.
* WASM: bytes in ReadResult.
* DataMatrix: use charset for encoding.
* QRCode: Support QR Code Model1.
* rMQR Code: Support Rectangular Micro QR Code.
- Refresh patch:
* cmake.patch
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zxing-cpp?expand=0&rev=37
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
Index: zxing-cpp-2.2.1/CMakeLists.txt
|
|
===================================================================
|
|
--- zxing-cpp-2.2.1.orig/CMakeLists.txt
|
|
+++ zxing-cpp-2.2.1/CMakeLists.txt
|
|
@@ -1,4 +1,4 @@
|
|
-cmake_minimum_required(VERSION 3.15)
|
|
+cmake_minimum_required(VERSION 3.5)
|
|
|
|
project(ZXing)
|
|
|
|
@@ -37,9 +37,6 @@ if (BUILD_SHARED_LIBS)
|
|
set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
|
endif()
|
|
|
|
-if (NOT CMAKE_CXX_STANDARD)
|
|
- set (CMAKE_CXX_STANDARD 17)
|
|
-endif()
|
|
if (NOT CMAKE_CXX_EXTENSIONS)
|
|
set (CMAKE_CXX_EXTENSIONS OFF)
|
|
endif()
|
|
Index: zxing-cpp-2.2.1/core/CMakeLists.txt
|
|
===================================================================
|
|
--- zxing-cpp-2.2.1.orig/core/CMakeLists.txt
|
|
+++ zxing-cpp-2.2.1/core/CMakeLists.txt
|
|
@@ -1,4 +1,4 @@
|
|
-cmake_minimum_required(VERSION 3.15)
|
|
+cmake_minimum_required(VERSION 3.5)
|
|
|
|
project (ZXing VERSION "2.2.1")
|
|
set (ZXING_SONAME 3) # see https://github.com/zxing-cpp/zxing-cpp/issues/333
|
|
@@ -464,8 +464,6 @@ if (COMPILER_NEEDS_FLOAT_STORE)
|
|
)
|
|
endif()
|
|
|
|
-target_compile_features(ZXing PUBLIC cxx_std_17)
|
|
-
|
|
target_link_libraries (ZXing PRIVATE Threads::Threads)
|
|
|
|
add_library(ZXing::ZXing ALIAS ZXing)
|