Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-23 22:39:43 -05:00
Code Issues Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
release-tool
View File

@ -64,10 +64,9 @@ printUsage() {
cat << EOF
Commands:
merge Merge release development branch into main branch
and create release tags
merge Merge release branch into main branch and create release tags
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
EOF
elif [ "merge" == "$cmd" ]; then
@ -477,16 +476,25 @@ build() {
export CXX="$COMPILER"
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
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..."
make package
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..."
make DESTDIR="${OUTPUT_DIR}/bin-release" install/strip