mirror of https://github.com/CGAL/cgal
Make C:\Program Files\ the default installation dir
On x64 versions of Windows, the default installation directory was « C:\Program Files (x86)\ ». Our installer does not install x86 or x64 binaries, but source code. So C:\Program Files\ seems the best choice on all Windows version.
This commit is contained in:
parent
a8f0e9121b
commit
dc0e3112f7
|
|
@ -19,6 +19,7 @@
|
|||
!include "StrRep.nsh"
|
||||
!include "WriteEnvStr.nsh"
|
||||
!include "EnvVarUpdate.nsh"
|
||||
!include "x64.nsh"
|
||||
|
||||
;!define DebugLog
|
||||
|
||||
|
|
@ -44,8 +45,10 @@
|
|||
OutFile "${CGAL_SRC}-Setup.exe"
|
||||
!endif
|
||||
|
||||
;Default installation folder
|
||||
InstallDir "$PROGRAMFILES\${CGAL_SRC}"
|
||||
;Default installation folder: C:\Program Files\CGAL-4.2
|
||||
; See also .onInit
|
||||
Installdir ""
|
||||
|
||||
|
||||
;Get installation folder from registry if available
|
||||
InstallDirRegKey HKCU "Software\${CGAL_SRC}" ""
|
||||
|
|
@ -320,6 +323,15 @@ SectionEnd
|
|||
|
||||
Function .onInit
|
||||
|
||||
# Setup the default installation dir
|
||||
${If} $InstDir == "" ; /D= was not used on the command line
|
||||
${If} ${RunningX64}
|
||||
StrCpy $InstDir "$PROGRAMFILES64\${CGAL_SRC}"
|
||||
${Else}
|
||||
StrCpy $InstDir "$PROGRAMFILES\${CGAL_SRC}"
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
|
||||
!ifdef DebugLog
|
||||
${LogSetFileName} "${CGAL_SRC}_install_log.txt"
|
||||
${LogSetOn}
|
||||
|
|
|
|||
Loading…
Reference in New Issue