From c07b53999ddf5563465bbe0aeb492a06bdd15b97 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Sat, 12 Jul 2014 00:11:48 +0200
Subject: [PATCH 1/2] Fix: ensure git is always run from the project directory

When trying to obtain the version hash
---
 cmake/getversion.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/getversion.cmake b/cmake/getversion.cmake
index 9db61040..e434e992 100644
--- a/cmake/getversion.cmake
+++ b/cmake/getversion.cmake
@@ -2,6 +2,7 @@ find_package(Git)
 if(GIT_FOUND)
 	execute_process(
 		COMMAND ${GIT_EXECUTABLE} describe --long --always
+		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 		RESULT_VARIABLE res_var
 		OUTPUT_VARIABLE GIT_COM_ID
 	)

From 23b0a6c0dfd6d4a2055f87ae2a4e7efbe1d18bed Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Sat, 12 Jul 2014 01:38:00 +0200
Subject: [PATCH 2/2] Windows + CPack: fix packaging
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Package the correct cpack’s temporary directory
---
 cmake/NSIS.definitions.nsh.in | 4 +---
 cmake/NSIS.template.in        | 6 ++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/NSIS.definitions.nsh.in b/cmake/NSIS.definitions.nsh.in
index 0d98b666..cc4b014c 100644
--- a/cmake/NSIS.definitions.nsh.in
+++ b/cmake/NSIS.definitions.nsh.in
@@ -1,3 +1 @@
-!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
diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
index b2c60d11..c04169c8 100644
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@@ -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