Skip to content

Commit

Permalink
AppVeyor config: hopefully fix setting debug/release package suffix
Browse files Browse the repository at this point in the history
  • Loading branch information
qris committed Apr 16, 2017
1 parent 3c52667 commit 4cb64d0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -52,7 +52,7 @@ install:
# CMake always seems to default to the latest version of Visual Studio, not the one on
# the current PATH.
- cmake -G "%Generator%" -A %PLATFORM% -DDEBUG=1
-DCPACK_PACKAGE_VERSION_PATCH=0_appveyor_ci_%CONFIGURATION%
-DPACKAGE_VERSION_PATCH=0_appveyor_ci_%CONFIGURATION%
%APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\windows

# Leave the current directory in the correct place to find the solution file using its relative path above.
Expand Down
5 changes: 4 additions & 1 deletion infrastructure/cmake/CMakeLists.txt
Expand Up @@ -751,6 +751,9 @@ set_tests_properties(bbackupd PROPERTIES TIMEOUT 1200)
set_tests_properties(s3store PROPERTIES TIMEOUT 20)
set_tests_properties(httpserver PROPERTIES TIMEOUT 40)

# This may be overridden by the CMake command line to add an extra suffix:
set(PACKAGE_VERSION_PATCH "0" CACHE STRING "Package version suffix (patch version)")

set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Box Backup is an open source, completely automatic, on-line backup system")
set(CPACK_PACKAGE_VENDOR "www.BoxBackup.org")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${base_dir}/README.md")
Expand All @@ -759,7 +762,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "12")
string(TIMESTAMP date "%Y%m%d" UTC)
# This may be overridden by the CMake command line to add an extra suffix:
set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_VERSION_PATCH "${PACKAGE_VERSION_PATCH}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Box Backup")
set(CPACK_COMPONENTS_ALL Applications)
set(CPACK_GENERATOR "ZIP;NSIS")
Expand Down

0 comments on commit 4cb64d0

Please sign in to comment.