From 3c5a8c5ea30745217e094884540af60046a4defd Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 15 Apr 2020 09:55:31 +0200 Subject: [PATCH] Set name to CPACK variable Apply configure on nsi --- .../cmake_builder/linphone_package/CMakeLists.txt | 2 +- .../linphone_package/windows/NSIS.template.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt index bccf6b74a..9e86e8a6a 100644 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt @@ -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") diff --git a/linphone-app/cmake_builder/linphone_package/windows/NSIS.template.in b/linphone-app/cmake_builder/linphone_package/windows/NSIS.template.in index 647d7829a..582588ceb 100644 --- a/linphone-app/cmake_builder/linphone_package/windows/NSIS.template.in +++ b/linphone-app/cmake_builder/linphone_package/windows/NSIS.template.in @@ -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