diff --git a/CMakeLists.txt b/CMakeLists.txt index e51516a..4909e44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) if(POLICY CMP0074) cmake_policy(SET CMP0074 NEW) endif() -project(ID-updater VERSION 3.15.0) +project(ID-updater VERSION 3.16.0) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) @@ -150,7 +150,7 @@ else() add_custom_target(installer DEPENDS ${PROJECT_NAME} COMMAND "$ENV{WIX}bin\\candle.exe" -nologo -arch ${PLATFORM} -dMSI_VERSION=${VERSION} -dqt_path=${qtCore_install_prefix} - -dqt_suffix=$<$:d> -dqtconf=${CMAKE_SOURCE_DIR}/qt.conf -dlibs_path="${SSL_PATH}" + -dqt_suffix=$<$:d> -dlibs_path="${SSL_PATH}" -dupdater_path=$ ${CMAKE_SOURCE_DIR}/idupdater.wxs ${CMAKE_SOURCE_DIR}/cmake/modules/WelcomeDlg2.wxs ${CMAKE_SOURCE_DIR}/cmake/modules/WixUI_Minimal2.wxs COMMAND "$ENV{WIX}bin\\light.exe" -nologo -o "${MSI_FILE}.msi" -ext WixUIExtension diff --git a/cmake b/cmake index 01ec22d..712a5c2 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 01ec22ddceaf93824737bed3158bd4a560c4af9d +Subproject commit 712a5c2828c01282150b657ff6932cc32fc17947 diff --git a/idupdater.rc b/idupdater.rc index 538c15d..d630f0d 100644 --- a/idupdater.rc +++ b/idupdater.rc @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "ID Updater Application" VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) VALUE "InternalName", "id-updater" - VALUE "LegalCopyright", "Copyright (C) 2009-2023 Estonian Information System Authority" + VALUE "LegalCopyright", "Copyright (C) 2009-2024 Estonian Information System Authority" VALUE "OriginalFilename", "id-updater.exe" VALUE "ProductName", "id-updater" VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)