mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix CMake options on Windows

Browse source
This commit is contained in:
Janek Bevendorff 2017-01-28 22:19:23 +01:00
parent c87c811719
commit 96ca7a8cbc
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
release-tool
View file

@ -64,10 +64,9 @@ printUsage() {
cat << EOF cat << EOF
Commands: Commands:
merge Merge release development branch into main branch merge Merge release branch into main branch and create release tags
and create release tags
build Build and package binary release from sources build Build and package binary release from sources
sign Sign compile release packages sign Sign previously compiled release packages
help Show help for the given command help Show help for the given command
EOF EOF
elif [ "merge" == "$cmd" ]; then elif [ "merge" == "$cmd" ]; then
@ -477,16 +476,25 @@ build() {
export CXX="$COMPILER" export CXX="$COMPILER"
if [ "" == "$DOCKER_IMAGE" ]; then if [ "" == "$DOCKER_IMAGE" ]; then
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
-DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" "$SRC_DIR"
logInfo "Compiling sources..."
make $MAKE_OPTIONS
if [ "$(uname -i)" == "Msys" ]; then if [ "$(uname -i)" == "Msys" ]; then
logInfo "Configuring build..."
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off -G"MSYS Makefiles" \
-DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" $CMAKE_OPTIONS "$SRC_DIR"
logInfo "Compiling sources..."
make $MAKE_OPTIONS
logInfo "Bundling binary packages..." logInfo "Bundling binary packages..."
make package make package
else else
logInfo "Configuring build..."
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
-DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" "$SRC_DIR"
logInfo "Compiling sources..."
make $MAKE_OPTIONS
logInfo "Installing to bin dir..." logInfo "Installing to bin dir..."
make DESTDIR="${OUTPUT_DIR}/bin-release" install/strip make DESTDIR="${OUTPUT_DIR}/bin-release" install/strip