diff options
author | Janek Bevendorff <janek@jbev.net> | 2017-01-29 00:19:23 +0300 |
---|---|---|
committer | Janek Bevendorff <janek@jbev.net> | 2017-01-29 00:19:23 +0300 |
commit | 96ca7a8cbcd55e4e9342e267a279ab47828dd584 (patch) | |
tree | 5d9faf82c852841f414871bc3e4c8cb4c6d9dfbd /release-tool | |
parent | c87c8117194594a6c9ca4a5e6dc4db502b58551c (diff) |
Fix CMake options on Windows
Diffstat (limited to 'release-tool')
-rwxr-xr-x | release-tool | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/release-tool b/release-tool index 8e3285b1a..7c2a432c9 100755 --- a/release-tool +++ b/release-tool @@ -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 |