fix windows build and update logic

This commit is contained in:
uncor3
2025-11-18 23:29:00 -08:00
parent f4cb326771
commit ccf578b256
3 changed files with 6 additions and 5 deletions
+3 -3
View File
@@ -455,7 +455,7 @@ if(WIN32)
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}")
string(UUID CPACK_WIX_PRODUCT_GUID NAMESPACE "1a2b3c4d-5e6f-7a8b-9c0d-1e2f3a4b5c6d" NAME "${PROJECT_NAME}" TYPE MD5)
string(UUID CPACK_WIX_PRODUCT_GUID NAMESPACE "1a2b3c4d-5e6f-7a8b-9c0d-1e2f3a4b5c6d" NAME "${PROJECT_NAME}-${PROJECT_VERSION}" TYPE MD5)
string(UUID CPACK_WIX_UPGRADE_GUID NAMESPACE "d6c5b4a3-f2e1-d0c9-b8a7-f6e5d4c3b2a1" NAME "${PROJECT_NAME}" TYPE MD5)
set(CPACK_WIX_UI_REF "WixUI_InstallDir")
@@ -465,10 +465,10 @@ if(WIN32)
set(CPACK_WIX_INSTALL_SCOPE "perMachine")
set(CPACK_WIX_PROGRAM_MENU_FOLDER "${PROJECT_NAME}")
set(CPACK_PACKAGE_EXECUTABLES "iDescriptor" "iDescriptor")
set(CPACK_WIX_CREATE_DESKTOP_SHORTCUT "iDescriptor")
set(CPACK_CREATE_DESKTOP_LINKS "iDescriptor")
set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/app-icon/icon.ico")
set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}/resources/installer/LICENSE.rtf")
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
set(CPACK_ARCHIVE_COMPONENT_INSTALL TRUE)
set(CPACK_ARCHIVE_INSTALL_DIRECTORY ".")
+2 -1
View File
@@ -252,7 +252,8 @@ MainWindow::MainWindow(QWidget *parent)
bool isPortable = false;
bool skipPrerelease = true;
#ifdef WIN32
isPortable = is_iDescriptorInstalled();
isPortable = !is_iDescriptorInstalled();
qDebug() << "isPortable=" << isPortable;
#endif
/*
+1 -1
View File
@@ -17,11 +17,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef CHECK_DEPS_H
#define CHECK_DEPS_H
bool IsAppleMobileDeviceSupportInstalled();
bool IsWinFspInstalled();
bool is_iDescriptorInstalled();
#endif // CHECK_DEPS_H