Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix: tuned up build configuration
  • Loading branch information
wdigger committed Aug 25, 2017
1 parent 2b978b9 commit 4fe73ec
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Expand Up @@ -65,12 +65,12 @@ 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
- cmd: nmake package

after_build:
- ps: |
Push-AppveyorArtifact FreeSerf-$env:PLATFORM.exe
Push-AppveyorArtifact FreeSerf-$env:PLATFORM-$env:CONFIGURATION.exe
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Expand Up @@ -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")
Expand Down

0 comments on commit 4fe73ec

Please sign in to comment.