mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-31 10:59:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set name to CPACK variable

Browse source 
Apply configure on nsi
This commit is contained in:
Julien Wadel 2020-04-15 09:55:31 +02:00
parent 76557a1c00
commit 3c5a8c5ea3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-app/cmake_builder/linphone_package/CMakeLists.txt
View file

@ -336,7 +336,7 @@ if(${ENABLE_APP_PACKAGING})
string(REPLACE "\\" "\\\\" ESCAPED_DOS_STYLE_BINARY_DIR "${DOS_STYLE_BINARY_DIR}")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/install.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/install.nsi" @ONLY)
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "!include \\\"${ESCAPED_DOS_STYLE_BINARY_DIR}\\\\install.nsi\\\"")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/uninstall.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/uninstall.nsi" COPYONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/uninstall.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/uninstall.nsi" @ONLY)
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "!include \\\"${ESCAPED_DOS_STYLE_BINARY_DIR}\\\\uninstall.nsi\\\"")
set(CPACK_NSIS_EXECUTABLES_DIRECTORY "bin")
set(CPACK_NSIS_MUI_FINISHPAGE_RUN "${EXECUTABLE_NAME}.exe")

8
linphone-app/cmake_builder/linphone_package/windows/NSIS.template.in
View file

@ -903,10 +903,10 @@ SectionEnd
; "Program Files" for AllUsers, "My Documents" for JustMe...
Function .onInit
FindWindow $0 "gdkWindowToplevel" "@APPLICATION_NAME@"
FindWindow $1 "Qt5QWindowOwnDCIcon" "@APPLICATION_NAME@"
FindWindow $0 "gdkWindowToplevel" "@CPACK_PACKAGE_NAME@"
FindWindow $1 "Qt5QWindowOwnDCIcon" "@CPACK_PACKAGE_NAME@"
StrCmp "$0$1" "00" notRunning
MessageBox MB_OK|MB_ICONEXCLAMATION "@APPLICATION_NAME@ is running. Please close it first and restart the installation." /SD IDOK
MessageBox MB_OK|MB_ICONEXCLAMATION "@CPACK_PACKAGE_NAME@ is running. Please close it first and restart the installation." /SD IDOK
Abort
notRunning:
@ -915,7 +915,7 @@ notRunning:
StrCmp $0 "" inst
MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
"@APPLICATION_NAME@ is already installed. $\n$\nDo you want to continue and uninstall the old version before installing the new one?" \
"@CPACK_PACKAGE_NAME@ is already installed. $\n$\nDo you want to continue and uninstall the old version before installing the new one?" \
IDOK uninst
Abort