Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
23b0a6c0
Commit
23b0a6c0
authored
Jul 12, 2014
by
Fabio Bas
Browse files
Windows + CPack: fix packaging
Package the correct cpack’s temporary directory
parent
c07b5399
Changes
2
Hide whitespace changes
Inline
Side-by-side
cmake/NSIS.definitions.nsh.in
View file @
23b0a6c0
!define NSIS_PROJECT_NAME "@PROJECT_NAME@"
!define NSIS_SOURCE_PATH "@PROJECT_SOURCE_DIR@"
!define NSIS_BINARY_PATH "@PROJECT_BINARY_DIR@"
\ No newline at end of file
!define NSIS_SOURCE_PATH "@PROJECT_SOURCE_DIR@"
\ No newline at end of file
cmake/NSIS.template.in
View file @
23b0a6c0
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment