Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zxing: include path #26361

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions recipes/zxing-cpp/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ patches:
- patch_file: "patches/1.4.0-0001-fix-string-view.patch"
patch_description: "fix compilation error for string_view on several compilers"
patch_type: "portability"
"1.3.0":
- patch_file: "patches/1.3.0-0001-include-cstdint.patch"
patch_description: "include cstdint"
patch_type: "portability"
"1.0.8":
- patch_file: "patches/1.0.8-0001-Fix-C2327-for-MSVC-2015.patch"
patch_description: "fix compilation error C2327 on MSVC 2015"
Expand All @@ -40,3 +44,6 @@ patches:
- patch_file: "patches/1.0.8-0004-include-cstddef.patch"
patch_description: "include cstddef"
patch_type: "portability"
- patch_file: "patches/1.0.8-0005-include-cstdint.patch"
patch_description: "include cstdint"
patch_type: "portability"
1 change: 1 addition & 0 deletions recipes/zxing-cpp/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ def package_info(self):
self.cpp_info.set_property("cmake_file_name", "ZXing")
self.cpp_info.set_property("cmake_target_name", "ZXing::ZXing")
self.cpp_info.set_property("pkg_config_name", "zxing")
self.cpp_info.includedirs.append(os.path.join("include", "ZXing"))
self.cpp_info.libs = ["ZXingCore" if Version(self.version) < "1.1" else "ZXing"]
if self.settings.os in ["Linux", "FreeBSD"]:
self.cpp_info.system_libs = ["pthread", "m"]
Expand Down
31 changes: 31 additions & 0 deletions recipes/zxing-cpp/all/patches/1.0.8-0005-include-cstdint.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
--- core/src/DecodeHints.h
+++ core/src/DecodeHints.h
@@ -16,6 +16,7 @@
* limitations under the License.
*/

+#include <cstdint>
#include <vector>
#include <sstream>
#include <string>
--- core/src/pdf417/PDFCodewordDecoder.cpp
+++ core/src/pdf417/PDFCodewordDecoder.cpp
@@ -17,6 +17,7 @@

#include "PDFCodewordDecoder.h"

+#include <cstdint>
#include <vector>
#include <numeric>
#include <limits>
--- core/src/textcodec/JPTextEncoder.cpp
+++ core/src/textcodec/JPTextEncoder.cpp
@@ -37,6 +37,8 @@

#include "JPTextEncoder.h"

+#include <cstdint>
+
/*
* This data is derived from Unicode 1.1,
* JIS X 0208 (1990) to Unicode mapping table version 0.9 .
11 changes: 11 additions & 0 deletions recipes/zxing-cpp/all/patches/1.3.0-0001-include-cstdint.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- core/src/textcodec/JPTextEncoder.cpp
+++ core/src/textcodec/JPTextEncoder.cpp
@@ -37,6 +37,8 @@

#include "JPTextEncoder.h"

+#include <cstdint>
+
/*
* This data is derived from Unicode 1.1,
* JIS X 0208 (1990) to Unicode mapping table version 0.9 .
10 changes: 5 additions & 5 deletions recipes/zxing-cpp/all/test_package/test_package.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "ZXing/BarcodeFormat.h"
#include "ZXing/MultiFormatWriter.h"
#include "ZXing/BitMatrix.h"
#include "ZXing/ByteMatrix.h"
#include "ZXing/TextUtfEncoding.h"
#include "BarcodeFormat.h"
#include "MultiFormatWriter.h"
#include "BitMatrix.h"
#include "ByteMatrix.h"
#include "TextUtfEncoding.h"

#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image_write.h"
Expand Down
12 changes: 6 additions & 6 deletions recipes/zxing-cpp/all/test_package/test_package_1.1.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "ZXing/BarcodeFormat.h"
#include "ZXing/BitMatrix.h"
#include "ZXing/BitMatrixIO.h"
#include "ZXing/CharacterSet.h"
#include "ZXing/MultiFormatWriter.h"
#include "ZXing/TextUtfEncoding.h"
#include "BarcodeFormat.h"
#include "BitMatrix.h"
#include "BitMatrixIO.h"
#include "CharacterSet.h"
#include "MultiFormatWriter.h"
#include "TextUtfEncoding.h"

#include <algorithm>
#include <cctype>
Expand Down
10 changes: 5 additions & 5 deletions recipes/zxing-cpp/all/test_package/test_package_2.0.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "ZXing/BarcodeFormat.h"
#include "ZXing/BitMatrix.h"
#include "ZXing/BitMatrixIO.h"
#include "ZXing/CharacterSet.h"
#include "ZXing/MultiFormatWriter.h"
#include "BarcodeFormat.h"
#include "BitMatrix.h"
#include "BitMatrixIO.h"
#include "CharacterSet.h"
#include "MultiFormatWriter.h"

#include <algorithm>
#include <cctype>
Expand Down