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

List:       kde-commits
Subject:    [kde1-kdelibs] cmake: - Fix install icons based on a patch idea coming from Luca Weiss <luca.emanuel
From:       Helio Chissini de Castro <helio () kde ! org>
Date:       2016-10-15 10:54:41
Message-ID: E1bvMbx-0002AM-FQ () code ! kde ! org
[Download RAW message or body]

Git commit 045c89f8a71d521897bb6ac2447f0d396c2d1016 by Helio Chissini de Ca=
stro.
Committed on 15/10/2016 at 10:52.
Pushed by helio into branch 'master'.

- Fix install icons based on a patch idea coming from Luca Weiss <luca.eman=
uel.weiss@gmail.com>
He spotted that the icons are not properly installed when used a alternativ=
e directory than
the regular install ones. Kpanel is fixed.
Many thanks to Luca

M  +16   -9    cmake/KDE1Macros.cmake

http://commits.kde.org/kde1-kdelibs/045c89f8a71d521897bb6ac2447f0d396c2d1016

diff --git a/cmake/KDE1Macros.cmake b/cmake/KDE1Macros.cmake
index c1287bf..73b5851 100644
--- a/cmake/KDE1Macros.cmake
+++ b/cmake/KDE1Macros.cmake
@@ -81,14 +81,21 @@ function (install_potfiles languages potfiles)
     endforeach ()
 endfunction ()
 =

-function (install_icon icon targetdir)
-    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${icon}")
-        install(FILES ${icon} DESTINATION ${KDE1_ICONDIR}/${targetdir} REN=
AME ${icon})
-    endif()
-    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mini-${icon}")
-        install(FILES mini-${icon} DESTINATION ${KDE1_MINIDIR}/${targetdir=
} RENAME ${icon})
-    endif()
-    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/large-${icon}")
-        install(FILES large-${icon} DESTINATION ${KDE1_ICONDIR}/${targetdi=
r}/large/ RENAME ${icon})
+function (install_icon)
+    set(icon_list ${ARGN})
+    list(LENGTH icon_list SIZE)
+    set(icon ${ARGV0})
+    if( "${SIZE}" EQUAL 2 )
+        install(FILES ${icon} DESTINATION ${ARGV1})
+    else()
+        if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${icon}")
+            install(FILES ${icon} DESTINATION ${KDE1_ICONDIR}/${targetdir})
+        endif()
+        if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mini-${icon}")
+            install(FILES mini-${icon} DESTINATION ${KDE1_MINIDIR}/${targe=
tdir} RENAME ${icon})
+        endif()
+        if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/large-${icon}")
+            install(FILES large-${icon} DESTINATION ${KDE1_ICONDIR}/${targ=
etdir}/large/ RENAME ${icon})
+        endif()
     endif()
 endfunction ()
[prev in list] [next in list] [prev in thread] [next in thread]