From 2b6252942d8e8220deec66cb077a3aa86d8b93b5 Mon Sep 17 00:00:00 2001 From: Diego Iastrubni Date: Sat, 20 Jul 2024 18:56:06 +0300 Subject: [PATCH] take 42 --- cmake/icons-breeze.cmake | 4 ++-- setup_script.iss | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmake/icons-breeze.cmake b/cmake/icons-breeze.cmake index 395acce..9008a60 100644 --- a/cmake/icons-breeze.cmake +++ b/cmake/icons-breeze.cmake @@ -16,7 +16,7 @@ function(download_breeze_icons VERSION) file(ARCHIVE_EXTRACT INPUT "${ZIP_FILE}" DESTINATION "${CMAKE_BINARY_DIR}") install(DIRECTORY - "${CMAKE_BINARY_DIR}/breeze-icons-${VERSION}/icons" - DESTINATION "${CMAKE_BINARY_DIR}/share/icons/breeze" + "${CMAKE_BINARY_DIR}/breeze-icons-${VERSION}/icons/" + DESTINATION "${CMAKE_BINARY_DIR}/share/icons/breeze/" ) endfunction() diff --git a/setup_script.iss b/setup_script.iss index 2e04598..8198d1b 100644 --- a/setup_script.iss +++ b/setup_script.iss @@ -15,12 +15,10 @@ ShowComponentSizes=yes Source: "dist\windows-msvc\usr\bin\qtedit4.exe"; DestDir: "{app}"; Source: "dist\windows-msvc\usr\bin\*"; DestDir: "{app}"; ;Source: "dist\windows-msvc\usr\share\icons\*"; DestDir: "{app}"; Flags: recursesubdirs ignoreversion noregerror allowunsafefiles -Source: "dist\windows-msvc\usr\share\icons\actions\16\*.svg"; DestDir: "{app}\icons\actions\16\"; Flags: ignoreversion -Source: "dist\windows-msvc\usr\share\icons\actions\32\*.svg"; DestDir: "{app}\icons\actions\32\"; Flags: ignoreversion - - -Source: "dist\windows-msvc\usr\share\icons\devices\16\*.svg"; DestDir: "{app}\icons\devices\16\"; Flags: ignoreversion -Source: "dist\windows-msvc\usr\share\icons\devices\32\*.svg"; DestDir: "{app}\icons\devices\32\"; Flags: ignoreversion +Source: "dist\windows-msvc\usr\share\icons\breeze\actions\16\*.svg"; DestDir: "{app}\icons\actions\16\"; Flags: ignoreversion +Source: "dist\windows-msvc\usr\share\icons\breeze\actions\32\*.svg"; DestDir: "{app}\icons\actions\32\"; Flags: ignoreversion +Source: "dist\windows-msvc\usr\share\icons\breeze\devices\16\*.svg"; DestDir: "{app}\icons\devices\16\"; Flags: ignoreversion +Source: "dist\windows-msvc\usr\share\icons\breeze\devices\32\*.svg"; DestDir: "{app}\icons\devices\32\"; Flags: ignoreversion [Icons] Name: "{group}\qtedit4"; Filename: "{app}\qtedit4.exe"