diff options
author | Maxime Hadjinlian <maxime.hadjinlian@gmail.com> | 2015-07-26 22:38:27 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-10-04 15:11:57 +0100 |
commit | 7e5ddbcb0645cbecd9838c3d4fe8aafe66fa04aa (patch) | |
tree | 54346e441161af2575e656e392fb657736df8e45 /package/zxing-cpp/0001-CMakeLists-add-rules-for-installation.patch | |
parent | 0611258aeae3b2e311b1c8fbebd337c9567830fb (diff) | |
download | buildroot-7e5ddbcb0645cbecd9838c3d4fe8aafe66fa04aa.tar.gz buildroot-7e5ddbcb0645cbecd9838c3d4fe8aafe66fa04aa.zip |
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 <maxime.hadjinlian@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/zxing-cpp/0001-CMakeLists-add-rules-for-installation.patch')
-rw-r--r-- | package/zxing-cpp/0001-CMakeLists-add-rules-for-installation.patch | 33 |
1 files changed, 33 insertions, 0 deletions
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 <thomas.petazzoni@free-electrons.com> +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 <thomas.petazzoni@free-electrons.com> +--- + 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 + |