Skip to content

Commit

Permalink
Fix CPack rules.
Browse files Browse the repository at this point in the history
  • Loading branch information
ashaduri committed May 28, 2024
1 parent eb8d914 commit 698024d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packaging/cpack_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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")
Expand All @@ -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.
Expand Down

0 comments on commit 698024d

Please sign in to comment.