aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Windows + CPack: fix packaging

Browse source 
Package the correct cpack’s temporary directory
This commit is contained in:
Fabio Bas 2014-07-12 01:38:00 +02:00
parent c07b53999d
commit 23b0a6c0df
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/NSIS.definitions.nsh.in
View file

@ -1,3 +1 @@
!define NSIS_PROJECT_NAME "@PROJECT_NAME@"
!define NSIS_SOURCE_PATH "@PROJECT_SOURCE_DIR@"
!define NSIS_BINARY_PATH "@PROJECT_BINARY_DIR@"

6
cmake/NSIS.template.in
View file

@ -2,10 +2,11 @@
!include "MUI2.nsh"
!include "FileFunc.nsh"
Name "${NSIS_PROJECT_NAME}"
Name "@CPACK_PACKAGE_NAME@"
OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
SetCompressor /SOLID lzma
InstallDir "$PROGRAMFILES\Cockatrice"
!define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
!define MUI_ABORTWARNING
!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSIS_SOURCE_PATH}\cmake\leftimage.bmp"
@ -35,7 +36,8 @@ Section "Application" SecApplication
SetShellVarContext all
SetOutPath "$INSTDIR"
File /r "${NSIS_BINARY_PATH}\Release\*.*"
@CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS@
@CPACK_NSIS_FULL_INSTALL@
WriteUninstaller "$INSTDIR\uninstall.exe"
${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2