Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-19 03:01:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #664 from keepassxreboot/feature/fix-release-building

Browse Source 
Fix release building and require CMake 3.1+
This commit is contained in:
Jonathan White 2017-06-25 20:59:09 -04:00 committed by GitHub
commit 9d1c58a218
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -22,7 +22,7 @@ endif()
project(KeePassXC) project(KeePassXC)
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 3.1.0)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

20
Dockerfile
View File

@ -21,7 +21,13 @@ RUN set -x \
&& apt-get install --yes software-properties-common && apt-get install --yes software-properties-common
RUN set -x \ RUN set -x \
&& add-apt-repository --yes ppa:beineri/opt-qt58-trusty && add-apt-repository ppa:george-edison55/cmake-3.x
ENV QT_VERSION=qt59
RUN set -x \
&& add-apt-repository --yes ppa:beineri/opt-${QT_VERSION}-trusty
RUN set -x \ RUN set -x \
&& apt-get update \ && apt-get update \
@ -29,9 +35,9 @@ RUN set -x \
g++ \ g++ \
cmake \ cmake \
libgcrypt20-dev \ libgcrypt20-dev \
qt58base \ ${QT_VERSION}base \
qt58tools \ ${QT_VERSION}tools \
qt58x11extras \ ${QT_VERSION}x11extras \
libxi-dev \ libxi-dev \
libxtst-dev \ libxtst-dev \
zlib1g-dev \ zlib1g-dev \
@ -50,7 +56,7 @@ VOLUME /keepassxc/src
VOLUME /keepassxc/out VOLUME /keepassxc/out
WORKDIR /keepassxc WORKDIR /keepassxc
ENV CMAKE_PREFIX_PATH=/opt/qt58/lib/cmake ENV CMAKE_PREFIX_PATH=/opt/${QT_VERSION}/lib/cmake
ENV LD_LIBRARY_PATH=/opt/qt58/lib ENV LD_LIBRARY_PATH=/opt/${QT_VERSION}/lib
RUN set -x \ RUN set -x \
&& echo /opt/qt58/lib > /etc/ld.so.conf.d/qt58.conf && echo /opt/${QT_VERSION}/lib > /etc/ld.so.conf.d/${QT_VERSION}.conf

3
release-tool
View File

@ -525,8 +525,7 @@ build() {
done done
init init
checkWorkingTreeClean
performChecks
OUTPUT_DIR="$(realpath "$OUTPUT_DIR")" OUTPUT_DIR="$(realpath "$OUTPUT_DIR")"