From 7e5ddbcb0645cbecd9838c3d4fe8aafe66fa04aa Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Sun, 26 Jul 2015 22:38:27 +0200 Subject: zxing-cpp: new package, replacing zxing ZXing was hosted on Google Code, which is a closing. The current link was already redirecting to the github repo. But upstream is no longer supporting the cpp bindings, it's now a Java library/application. A fork has been created from the latest cpp source of the original upstream. So this commit creates a new package, zxing-cpp, and adds Config.in.legacy handling for the old zxing pakcage that is removed. [Thomas: - add a patch that improves the CMakeLists.txt file to add installation rules. This allows to remove the manual installation logic from zxing-cpp.mk. - make libiconv a normal optional dependency. No need to involve BR2_ENABLE_LOCALE in the condition, since libiconv can only be enabled when !BR2_ENABLE_LOCALE. - bump to the latest upstream version. - add hash file.] Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- ...001-CMakeLists-add-rules-for-installation.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/zxing-cpp/0001-CMakeLists-add-rules-for-installation.patch (limited to 'package/zxing-cpp/0001-CMakeLists-add-rules-for-installation.patch') diff --git a/package/zxing-cpp/0001-CMakeLists-add-rules-for-installation.patch b/package/zxing-cpp/0001-CMakeLists-add-rules-for-installation.patch new file mode 100644 index 0000000000..034f200528 --- /dev/null +++ b/package/zxing-cpp/0001-CMakeLists-add-rules-for-installation.patch @@ -0,0 +1,33 @@ +From 2bc58a87dd629cef4cd2c62c5132c319bede61fa Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 4 Oct 2015 11:49:52 +0100 +Subject: [PATCH] CMakeLists: add rules for installation + +This commit adds some CMake rules that allow to do a "make install" to +install the zxing binary, its library and corresponding header files. + +Submitted upstream: https://github.com/glassechidna/zxing-cpp/pull/31 + +Signed-off-by: Thomas Petazzoni +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f49b28d..7151d90 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,6 +68,10 @@ file(GLOB_RECURSE ZXING_FILES + ) + add_executable(zxing ${ZXING_FILES}) + target_link_libraries(zxing libzxing) ++install(TARGETS zxing libzxing ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin) ++install(DIRECTORY core/src/zxing/ DESTINATION include/zxing FILES_MATCHING PATTERN "*.h") + + # Add testrunner executable. + find_package(CPPUNIT) +-- +2.6.0 + -- cgit v1.2.3