From 3c9a822b50ffdd037fa96e54a46c5a91a33937c0 Mon Sep 17 00:00:00 2001 From: gitlost Date: Sun, 7 Jul 2019 04:30:41 +0100 Subject: [PATCH] Typo cmake LIBZINT_LIBRARIES -> LIBZINT_LIBRARY (#60) * Typo cmake LIBZINT_LIBRARIES -> LIBZINT_LIBRARY * Also adds libzint to appimage deployment --- .travis.yml | 3 ++- cmake/Modules/FindLibZint.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e97f3a8..a6fd501 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ before_install: install: - sudo apt-get -y install qt59base qt59svg qt59tools qt59translations zlib1g-dev xvfb - sudo apt-get -y install barcode libqrencode-dev + - wget https://downloads.sourceforge.net/project/zint/zint/2.6.3/zint-2.6.3_final.tar.gz && tar xzf zint-2.6.3_final.tar.gz && cd zint-2.6.3.src && mkdir build && cd build && cmake .. && make && sudo make install && cd ../.. - source /opt/qt5*/bin/qt5*-env.sh script: @@ -26,7 +27,7 @@ after_success: - wget -c "https://github.com/jimevins/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" - chmod a+x linuxdeployqt*.AppImage - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH - - export LD_LIBRARY_PATH=/opt/qt*/lib/:$LD_LIBRARY_PATH + - export LD_LIBRARY_PATH=/opt/qt*/lib/:/usr/local/lib:$LD_LIBRARY_PATH - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq diff --git a/cmake/Modules/FindLibZint.cmake b/cmake/Modules/FindLibZint.cmake index b44d80a..9f1a754 100644 --- a/cmake/Modules/FindLibZint.cmake +++ b/cmake/Modules/FindLibZint.cmake @@ -11,7 +11,7 @@ set (LIBZINT_DEFINITIONS "") find_path (LIBZINT_INCLUDE_DIR NAMES zint.h) -find_library (LIBZINT_LIBRARIES NAMES zint ) +find_library (LIBZINT_LIBRARY NAMES zint ) if (LIBZINT_LIBRARY AND LIBZINT_INCLUDE_DIR)