From 698024d47dc38538779ab4c698394d1a0016c1f8 Mon Sep 17 00:00:00 2001 From: Alexander Shaduri Date: Tue, 28 May 2024 13:44:00 +0400 Subject: [PATCH] Fix CPack rules. --- packaging/cpack_options.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/cpack_options.cmake b/packaging/cpack_options.cmake index 80b6a36..6c09ebf 100644 --- a/packaging/cpack_options.cmake +++ b/packaging/cpack_options.cmake @@ -126,7 +126,7 @@ set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS} if (WIN32) message(STATUS "CMAKE_FIND_ROOT_PATH: ${CMAKE_FIND_ROOT_PATH}") - set(APP_WINDOWS_SYSROOT "" CACHE "Location of system root for Windows binaries, for packing") + set(APP_WINDOWS_SYSROOT "" CACHE STRING "Location of system root for Windows binaries, for packing") if (NOT APP_WINDOWS_SYSROOT) # if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") # if (CMAKE_SIZEOF_VOID_P EQUAL 8) @@ -144,7 +144,7 @@ if (WIN32) endif() message(STATUS "APP_WINDOWS_SYSROOT: ${APP_WINDOWS_SYSROOT}") - set(APP_WINDOWS_GTK_ICONS_ROOT "" CACHE "Location of root folder for icons, for packing Windows packages") + set(APP_WINDOWS_GTK_ICONS_ROOT "" CACHE STRING "Location of root folder for icons, for packing Windows packages") if (NOT APP_WINDOWS_GTK_ICONS_ROOT) if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") set(APP_WINDOWS_GTK_ICONS_ROOT "${APP_WINDOWS_SYSROOT}/share/icons") @@ -156,7 +156,7 @@ if (WIN32) # This is for non-CI builds (CI uses extracted files). # FIXME The logic may be wrong here. - set(APP_WINDOWS_SMARTCTL_ROOT "" CACHE "Location of root folder for smartctl, for packing Windows packages") + set(APP_WINDOWS_SMARTCTL_ROOT "" CACHE STRING "Location of root folder for smartctl, for packing Windows packages") if (NOT APP_WINDOWS_SMARTCTL_ROOT) if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") # PROGRAMFILES matches the bitness of the installer.