[vlmc-devel] commit: nsis: clean the destination before building the new installer ( Ludovic Fauvet )

[git at videolan.org]

vlmc | branch: master | Ludovic Fauvet <etix at l0cal.com> | Sun Mar 28 22:59:47 2010 +0200| [44afa94bbc039534da0cf66e28e23f4277528641] | committer: Ludovic Fauvet 

nsis: clean the destination before building the new installer

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=44afa94bbc039534da0cf66e28e23f4277528641
---

 nsis/CMakeLists.txt |    7 ++++++-
 nsis/installer.nsi  |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nsis/CMakeLists.txt b/nsis/CMakeLists.txt
index 4ed837c..c743b49 100644
--- a/nsis/CMakeLists.txt
+++ b/nsis/CMakeLists.txt
@@ -1,4 +1,7 @@
 
+# Output file name
+SET(NSIS_OUTPUT_FILE "${PROJECT_NAME}.exe")
+
 # NSIS is only available for Win32 builds (native or cross compilation)
 IF(WIN32)
     
@@ -17,7 +20,9 @@ IF(WIN32)
         # Copy and configure the nsis script file
         CONFIGURE_FILE(installer.nsi "${CMAKE_BINARY_DIR}/bin/installer.nsi" @ONLY)
 
-        ADD_CUSTOM_TARGET(installer makensis "${CMAKE_BINARY_DIR}/bin/installer.nsi"
+        ADD_CUSTOM_TARGET(installer
+            ${CMAKE_COMMAND} -E remove "${CMAKE_BINARY_DIR}/bin/${NSIS_OUTPUT_FILE}"
+            COMMAND makensis "${CMAKE_BINARY_DIR}/bin/installer.nsi"
             WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
             )
 
diff --git a/nsis/installer.nsi b/nsis/installer.nsi
index 4321193..94ed23a 100644
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -1,6 +1,6 @@
 Name "VideoLAN Movie Creator"
 
-OutFile "@PROJECT_NAME at .exe"
+OutFile "@NSIS_OUTPUT_FILE@"
 
 InstallDir "$PROGRAMFILES\@PROJECT_NAME_SHORT@"
 InstallDirRegKey HKLM "Software\@PROJECT_NAME_SHORT@" "Install_Dir"