[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kexi/3.1] src/data: Win/Mac: still install copied KEXI files but add the original ones to the binar
From:       Jaroslaw Staniek <null () kde ! org>
Date:       2018-04-09 14:23:03
Message-ID: E1f5XhH-00048P-F4 () code ! kde ! org
[Download RAW message or body]

Git commit d9c7ab2b256a2c27b0cbda5380e0c85107540163 by Jaroslaw Staniek.
Committed on 09/04/2018 at 14:21.
Pushed by staniek into branch '3.1'.

Win/Mac: still install copied KEXI files but add the original ones to the b=
inary because the copied ones do not exist yet before ecm_add_app_icon() ge=
ts called

FIXED-IN:3.1.1

M  +5    -1    src/data/CMakeLists.txt

https://commits.kde.org/kexi/d9c7ab2b256a2c27b0cbda5380e0c85107540163

diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index ac3219611..eb8cf0a1e 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -23,7 +23,11 @@ macro(kexi_add_app_icons)
         VERBATIM
     )
     add_dependencies(kexi copy_app_icons)
-    ecm_add_app_icon(_source_var ICONS ${_files})
+    ecm_add_app_icon(
+        _source_var ICONS ${_source_files}) # Win/Mac: still install copie=
d KEXI files (_files)
+                                            # BUT add the original ones (_=
source_files) to the binary
+                                            # because the copied ones do n=
ot exist yet before
+                                            # ecm_add_app_icon() gets call=
ed
     ecm_install_icons(ICONS ${_files}
                       DESTINATION ${ICON_INSTALL_DIR}
                       THEME hicolor)
[prev in list] [next in list] [prev in thread] [next in thread]