Commit 5812dda2 authored by Jussi Lindgren's avatar Jussi Lindgren
parents 7bc757a3 25925ddb
......@@ -6,7 +6,7 @@ PROJECT(OpenVIBE)
# If you wish to maintain specific version numbers for a subproject, please do so in the projects CMakeLists.txt
SET(OV_GLOBAL_VERSION_MAJOR 1)
SET(OV_GLOBAL_VERSION_MINOR 0)
SET(OV_GLOBAL_VERSION_PATCH 0+git)
SET(OV_GLOBAL_VERSION_PATCH 1+git)
# Default is to build to dist/. If you wish a custom install, set your own MAKE_INSTALL_PREFIX when you call CMake. Safest to do under a fakeroot.
#IF(NOT CMAKE_INSTALL_PREFIX)
......
......@@ -1005,6 +1005,11 @@ FunctionEnd
Function .onInit
StrCpy $9 ${vs90}
; Note that for logging to work, you will need a logging-enabled build of nsis.
; At the time of writing this, you could get one from http://nsis.sourceforge.net/Special_Builds
LogSet on
; On silent install, we install all components
IfSilent 0 +2
Call EnableOptionals
......
......@@ -5,8 +5,8 @@
!include "zipdll.nsh"
;Name and file
Name "OpenViBE 1.0.0"
OutFile "openvibe-1.0.0-setup.exe"
Name "OpenViBE 1.0.1+git"
OutFile "openvibe-1.0.1+git-setup.exe"
;Default installation folder
InstallDir "$PROGRAMFILES\openvibe"
......@@ -45,6 +45,10 @@
Function .onInit
; Note that for logging to work, you will need a logging-enabled build of nsis.
; At the time of writing this, you could get one from http://nsis.sourceforge.net/Special_Builds
LogSet on
UserInfo::GetAccountType
Pop $R1
StrCmp $R1 "Admin" has_admin_rights 0
......@@ -70,6 +74,8 @@ FunctionEnd
Section "-OpenViBE"
LogSet on
${If} $OLDINSTDIR != ""
RMDir /r $OLDINSTDIR
RMDir /r "$SMPROGRAMS\OpenViBE"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment