mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 22:56:33 +00:00
zxing: bump upstream version, drop useless patch
The 0001-CMakeLists-add-rules-for-installation.patch patch has been merged upstream 7 minutes after it was submitted. So let's bump to the latest upstream version and drop the no longer needed patch. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
7e5ddbcb06
commit
6c8aceb2d5
@ -1,33 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 c3934e9e59b7496c9a4db7ad4d8eb43668da4b321ec705feebaf085b185b2d08 zxing-cpp-4abdbb62c9939014eca3e43ac7dfa30daa344536.tar.gz
|
sha256 164c0bc9f1ce2ff5659fddce6da71f8cdda091751f3b71140c090b58451a2b04 zxing-cpp-fa34227d26e0b388e65b81936a2681952928f5be.tar.gz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
ZXING_CPP_VERSION = 4abdbb62c9939014eca3e43ac7dfa30daa344536
|
ZXING_CPP_VERSION = fa34227d26e0b388e65b81936a2681952928f5be
|
||||||
ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION))
|
ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION))
|
||||||
ZXING_CPP_LICENSE = Apache-2.0
|
ZXING_CPP_LICENSE = Apache-2.0
|
||||||
ZXING_CPP_LICENSE_FILES = COPYING
|
ZXING_CPP_LICENSE_FILES = COPYING
|
||||||
|
Loading…
x
Reference in New Issue
Block a user