Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 00:09:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Setup new build dependencies.

Browse Source
This commit is contained in:
Felix Geyer 2015-07-22 20:53:49 +02:00
parent b904fe5acd
commit ec8c0bb3e7
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -7,9 +7,9 @@ compiler:
language: cpp language: cpp
install: install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake libqt4-dev libgcrypt11-dev zlib1g-dev libxtst-dev; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake qtbase5-dev libqt5x11extras5-dev qttools5-dev libgcrypt11-dev zlib1g-dev libxtst-dev; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cmake qt libgcrypt; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cmake qt5 libgcrypt; fi
before_script: mkdir build && pushd build before_script: mkdir build && pushd build
script: script:
- cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_GUI_TESTS=ON .. - cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_GUI_TESTS=ON ..

10
CMakeLists.txt
View File

@ -161,11 +161,11 @@ if(WITH_TESTS)
enable_testing() enable_testing()
endif(WITH_TESTS) endif(WITH_TESTS)
find_package(Qt5Core REQUIRED) find_package(Qt5Core 5.2 REQUIRED)
find_package(Qt5Concurrent REQUIRED) find_package(Qt5Concurrent 5.2 REQUIRED)
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets 5.2 REQUIRED)
find_package(Qt5Test REQUIRED) find_package(Qt5Test 5.2 REQUIRED)
find_package(Qt5LinguistTools REQUIRED) find_package(Qt5LinguistTools 5.2 REQUIRED)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
# Debian sets the the build type to None for package builds. # Debian sets the the build type to None for package builds.

8
README.md
View File

@ -49,20 +49,20 @@ Once downloaded, double click on the file to execute the installer.
The following tools must exist within your PATH: The following tools must exist within your PATH:
* make * make
* cmake (>= 2.6.4) * cmake (>= 2.8.12)
* g++ or clang++ * g++ or clang++
The following libraries are required: The following libraries are required:
* Qt 4 (>= 4.6) * Qt 5 (>= 5.2): qtbase and qttools5
* libgcrypt * libgcrypt
* zlib * zlib
* libxtst (optional for auto-type on X11) * libxtst, qtx11extras (optional for auto-type on X11)
On Debian you can install them with: On Debian you can install them with:
```bash ```bash
sudo apt-get install build-essential cmake libqt4-dev libgcrypt11-dev zlib1g-dev sudo apt-get install build-essential cmake qtbase5-dev libqt5x11extras5-dev qttools5-dev libgcrypt11-dev zlib1g-dev
``` ```
#### Build Steps #### Build Steps

2
src/autotype/CMakeLists.txt
View File

@ -1,6 +1,6 @@
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
find_package(X11) find_package(X11)
find_package(Qt5X11Extras) find_package(Qt5X11Extras 5.2)
add_feature_info(libXi X11_Xi_FOUND "The X11 Xi Protocol library is required for auto-type") add_feature_info(libXi X11_Xi_FOUND "The X11 Xi Protocol library is required for auto-type")
add_feature_info(libXtest X11_XTest_FOUND "The X11 XTEST Protocol library is required for auto-type") add_feature_info(libXtest X11_XTest_FOUND "The X11 XTEST Protocol library is required for auto-type")
add_feature_info(Qt5X11Extras Qt5X11Extras_FOUND "The Qt5X11Extras library is required for auto-type") add_feature_info(Qt5X11Extras Qt5X11Extras_FOUND "The Qt5X11Extras library is required for auto-type")