From 4fe73ec566169515451d641d1c3e5110c5a2247d Mon Sep 17 00:00:00 2001 From: Yury Klushin Date: Fri, 25 Aug 2017 22:44:57 +0300 Subject: [PATCH] Fix: tuned up build configuration --- .travis.yml | 2 +- README.md | 4 ++-- appveyor.yml | 4 ++-- src/CMakeLists.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 886535d6c..3fcc74cdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ install: script: - | cd $BUID_DIR - cmake $TRAVIS_BUILD_DIR + cmake -DCMAKE_BUILD_TYPE=Release $TRAVIS_BUILD_DIR make check_style make make test diff --git a/README.md b/README.md index 79fab28b4..891ee92f3 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ Build status Last build downloads -------------------- -* [Windows Installer x86](https://ci.appveyor.com/api/projects/jonls/freeserf/artifacts/FreeSerf-x86.exe?branch=master&pr=false&job=Configuration%3A%20Release%3B%20Platform%3A%20x86) -* [Windows Installer x64](https://ci.appveyor.com/api/projects/jonls/freeserf/artifacts/FreeSerf-x64.exe?branch=master&pr=false&job=Configuration%3A%20Release%3B%20Platform%3A%20x64) +* [Windows Installer x86](https://ci.appveyor.com/api/projects/jonls/freeserf/artifacts/FreeSerf-x86-Release.exe?branch=master&pr=false&job=Configuration%3A%20Release%3B%20Platform%3A%20x86) +* [Windows Installer x64](https://ci.appveyor.com/api/projects/jonls/freeserf/artifacts/FreeSerf-x64-Release.exe?branch=master&pr=false&job=Configuration%3A%20Release%3B%20Platform%3A%20x64) * [Linux Sources TAR.Z](https://s3.amazonaws.com/freeserf/freeserf/freeserf/master/FreeSerf.tar.Z) * [Linux Sources TAR.BZ2](https://s3.amazonaws.com/freeserf/freeserf/freeserf/master/FreeSerf.tar.bz2) * [Linux Sources TAR.GZ](https://s3.amazonaws.com/freeserf/freeserf/freeserf/master/FreeSerf.tar.gz) diff --git a/appveyor.yml b/appveyor.yml index 77e979b02..c91e8b055 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -65,7 +65,7 @@ install: $env:XMPDIR = $XMPDIR build_script: - - cmd: cmake -G "NMake Makefiles" + - cmd: cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%configuration% - cmd: nmake check_style - cmd: nmake - cmd: nmake test @@ -73,4 +73,4 @@ build_script: after_build: - ps: | - Push-AppveyorArtifact FreeSerf-$env:PLATFORM.exe + Push-AppveyorArtifact FreeSerf-$env:PLATFORM-$env:CONFIGURATION.exe diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f09c2f03..b36e733ab 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -151,7 +151,7 @@ if(WIN32) set(WIN_ARCH_STRING x86) endif() set(CPACK_GENERATOR "NSIS") - set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${WIN_ARCH_STRING}") + set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${WIN_ARCH_STRING}-${CMAKE_BUILD_TYPE}") set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME}) set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".") set(CPACK_PACKAGE_EXECUTABLES "FreeSerf;FreeSerf")