Skip to content

Commit

Permalink
Update libqrencode to v4.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
AxVultis committed Aug 2, 2020
1 parent 2634108 commit 47732bb
Show file tree
Hide file tree
Showing 69 changed files with 6,721 additions and 2,386 deletions.
8 changes: 4 additions & 4 deletions QREncode.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ file(GLOB QRENCODE_SOURCES RELATIVE ${CMAKE_SOURCE_DIR} libqrencode/*.c)
list(REMOVE_ITEM QRENCODE_SOURCES libqrencode/qrenc.c)
file(GLOB QRENCODE_HEADERS libqrencode/*.h)

list(APPEND my_definitions "__STATIC=static")
list(APPEND my_definitions "MAJOR_VERSION=3")
list(APPEND my_definitions "MINOR_VERSION=4")
list(APPEND my_definitions "MICRO_VERSION=0")
list(APPEND my_definitions "STATIC_IN_RELEASE=static")
list(APPEND my_definitions "MAJOR_VERSION=4")
list(APPEND my_definitions "MINOR_VERSION=0")
list(APPEND my_definitions "MICRO_VERSION=2")
if(WIN32)
list(APPEND my_definitions "inline=__inline")
endif(WIN32)
Expand Down
17 changes: 14 additions & 3 deletions libqrencode/.gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
*.[oa]
*.lo
*.la
*.gcno
*.gcov
*.gcda
.deps/
.libs/
autom4te.cache/
m4/
CMakeLists.txt.user
CMakeCache.txt
CTestTestfile.cmake
CMakeFiles/
cmake_install.cmake
Makefile
Makefile.in
README
build
config.log
configure
config.status
Expand All @@ -17,12 +27,9 @@ libtool
stamp-h1
qrencode
qrencode.1
qrencode.spec
libqrencode.pc
tests/create_frame_pattern
tests/create_mqr_frame_pattern
tests/frame
tests/mqrframe
tests/pthread_qrencode
tests/prof_qrencode
tests/test_bitstream
Expand All @@ -36,6 +43,7 @@ tests/test_qrinput
tests/test_qrspec
tests/test_rs
tests/test_split
tests/test_split_urls
tests/view_qrcode
use/compile
use/config.guess
Expand All @@ -44,3 +52,6 @@ use/depcomp
use/install-sh
use/ltmain.sh
use/missing
html/
massif.out.*
gmon.out
25 changes: 25 additions & 0 deletions libqrencode/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
dist: trusty
sudo: required
language: c

compiler:
- gcc

before_install:
- sudo apt-get update
- sudo apt-get install libpng12-dev

install:
- ./autogen.sh
- ./configure --with-tests && make
- sudo make install
- mkdir build && cd build
- cmake .. -DWITH_TESTS=yes -DBUILD_SHARED_LIBS=on && make
- DESTDIR=$PWD/install make install

script:
- cd $TRAVIS_BUILD_DIR/tests
- ./test_all.sh
- cd $TRAVIS_BUILD_DIR/build/tests
- cp $TRAVIS_BUILD_DIR/tests/frame ./
- make test
Loading

0 comments on commit 47732bb

Please sign in to comment.