Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-25 08:51:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ci builds

Browse Source 
ubuntu:14.04 does not have quazip5 libraries in the standard repository, therefore only insecure builds are created using the ci server
This commit is contained in:
Christian Kieschnick 2019-01-04 11:03:15 +01:00
parent 080b02e9d5
commit ba604390d2
4 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -359,8 +359,9 @@ include_directories(SYSTEM ${ARGON2_INCLUDE_DIR})
# Optional # Optional
if(WITH_XC_KEESHARE) if(WITH_XC_KEESHARE)
# ZLIB is needed and already required
find_package(QuaZip QUIET) find_package(QuaZip QUIET)
if(QuaZip_FOUND) if(QUAZIP_FOUND)
message(STATUS "Found QuaZip - allow KeeShare with secure container\n") message(STATUS "Found QuaZip - allow KeeShare with secure container\n")
set(WITH_XC_KEESHARE_INSECURE ON) set(WITH_XC_KEESHARE_INSECURE ON)
set(WITH_XC_KEESHARE_SECURE ON) set(WITH_XC_KEESHARE_SECURE ON)

3
Dockerfile
View File

@ -54,7 +54,8 @@ RUN set -x \
zlib1g-dev \ zlib1g-dev \
libxi-dev \ libxi-dev \
libxtst-dev \ libxtst-dev \
libquazip-dev \ # ubuntu:14.04 has no quazip (it's optional)
# libquazip5-dev \
mesa-common-dev \ mesa-common-dev \
libyubikey-dev \ libyubikey-dev \
libykpers-1-dev \ libykpers-1-dev \

3
ci/trusty/Dockerfile
View File

@ -54,7 +54,8 @@ RUN set -x \
zlib1g-dev \ zlib1g-dev \
libyubikey-dev \ libyubikey-dev \
libykpers-1-dev \ libykpers-1-dev \
libquazip-dev \ # ubuntu:14.04 has no quazip (it's optional)
# libquazip5-dev \
libxi-dev \ libxi-dev \
libxtst-dev \ libxtst-dev \
libqrencode-dev \ libqrencode-dev \

62
cmake/FindQuaZip.cmake
View File

@ -1,23 +1,43 @@
# Copyright (C) 2018 KeePassXC Team <team@keepassxc.org> # QUAZIP_FOUND - QuaZip library was found
# # QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
# This program is free software: you can redistribute it and/or modify # QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
# it under the terms of the GNU General Public License as published by # QUAZIP_LIBRARIES - List of QuaZip libraries
# the Free Software Foundation, either version 2 or (at your option) # QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers
# version 3 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
find_path(QUAZIP_INCLUDE_DIR quazip5/quazip.h)
find_library(QUAZIP_LIBRARIES quazip5)
mark_as_advanced(QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR) IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
# in cache already
include(FindPackageHandleStandardArgs) SET(QUAZIP_FOUND TRUE)
include_directories(${QUAZIP_INCLUDE_DIR}) ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
find_package_handle_standard_args(QuaZip DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR) IF (Qt5Core_FOUND)
set(QUAZIP_LIB_VERSION_SUFFIX 5)
ENDIF()
IF (WIN32)
FIND_PATH(QUAZIP_LIBRARY_DIR
WIN32_DEBUG_POSTFIX d
NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll
HINTS "C:/Programme/" "C:/Program Files"
PATH_SUFFIXES QuaZip/lib
)
FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR})
FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip)
FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
ELSE(WIN32)
FIND_PACKAGE(PkgConfig)
# pkg_check_modules(PC_QCA2 QUIET qca2)
pkg_check_modules(PC_QUAZIP quazip)
FIND_LIBRARY(QUAZIP_LIBRARIES
WIN32_DEBUG_POSTFIX d
NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
HINTS /usr/lib /usr/lib64
)
FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
HINTS /usr/include /usr/local/include
PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
)
FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
ENDIF (WIN32)
INCLUDE(FindPackageHandleStandardArgs)
SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)