lee/gsmartcontrol
1
0
Fork 0
mirror of https://github.com/ashaduri/gsmartcontrol.git synced 2026-09-26 05:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix msys2 packaging.

Browse Source
This commit is contained in:
Alexander Shaduri
2021-03-12 16:25:00 +04:00
parent 4960be8cd1
commit 6039667556
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/cpack_options.cmake
+8 -7
View File
@@ -184,10 +184,10 @@ if (WIN32)
if ("$ENV{CI}")
# GitHub download location
install(FILES
"${CMAKE_BUILD_DIR}/smartmontools/bin/drivedb.h"
"${CMAKE_BUILD_DIR}/smartmontools/bin/update-smart-drivedb.exe"
"${CMAKE_BUILD_DIR}/smartmontools/${SMARTCTL_EXTRACED_BIN_DIR}/smartctl-nc.exe"
"${CMAKE_BUILD_DIR}/smartmontools/${SMARTCTL_EXTRACED_BIN_DIR}/smartctl.exe"
"${CMAKE_BINARY_DIR}/smartmontools/bin/drivedb.h"
"${CMAKE_BINARY_DIR}/smartmontools/bin/update-smart-drivedb.exe"
"${CMAKE_BINARY_DIR}/smartmontools/${SMARTCTL_EXTRACED_BIN_DIR}/smartctl-nc.exe"
"${CMAKE_BINARY_DIR}/smartmontools/${SMARTCTL_EXTRACED_BIN_DIR}/smartctl.exe"
DESTINATION .
)
else()
@@ -341,13 +341,14 @@ if (WIN32)
endif()
endforeach()
# <prefix>/etc/gtk-3.0/ should contain settings.ini with a win32 theme.
install(FILES "${APP_WINDOWS_SYSROOT}/etc/fonts/fonts.conf" DESTINATION "etc/fonts/")
# install(FILES "${APP_WINDOWS_SYSROOT}/etc/gtk-3.0/im-multipress.conf" DESTINATION "etc/gtk-3.0/")
# Msys2 in github has problems with this (cannot install: file exists!)
# install(FILES "${APP_WINDOWS_SYSROOT}/etc/fonts/fonts.conf" DESTINATION "etc/fonts/")
# <prefix>/etc/gtk-3.0/ should contain settings.ini with a win32 theme.
# Use custom settings.ini to enable Windows theme
# install(FILES "${APP_WINDOWS_SYSROOT}/etc/gtk-3.0/settings.ini" DESTINATION "etc/gtk-3.0/")
install(FILES "${CMAKE_SOURCE_DIR}/packaging/gtk/etc/gtk-3.0/settings.ini" DESTINATION "etc/gtk-3.0/")
# install(FILES "${APP_WINDOWS_SYSROOT}/etc/gtk-3.0/im-multipress.conf" DESTINATION "etc/gtk-3.0/")
# Not present in msys2
# install(DIRECTORY "${APP_WINDOWS_SYSROOT}/share/themes" DESTINATION "share/")