[Pkg-owncloud-commits] [owncloud-client] 171/219: cmake: Fix installation of overlay icons on linux

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 788c27bf2fc9ceaf3e199e9f57743c930a818fc3
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Sep 29 16:08:49 2014 +0200

    cmake: Fix installation of overlay icons on linux
---
 shell_integration/icons/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shell_integration/icons/CMakeLists.txt b/shell_integration/icons/CMakeLists.txt
index 912e400..04174d5 100644
--- a/shell_integration/icons/CMakeLists.txt
+++ b/shell_integration/icons/CMakeLists.txt
@@ -14,7 +14,9 @@ if( UNIX AND NOT APPLE )
     FOREACH(size 128x128 16x16 256x256 32x32 48x48 64x64 72x72)
 	file(GLOB files  "${size}/*.png")
 	FOREACH( file ${files} )
-	    STRING(REPLACE "oC" ${APPLICATION_NAME} brandedName ${file})
+	    # the GLOB returns a absolute path. Make it relative by replacing the current src dir by nothing
+	    STRING(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/${size}/" "" shortFile ${file})
+	    STRING(REPLACE "oC" ${APPLICATION_NAME} brandedName ${shortFile})
 	    install(FILES ${file} DESTINATION ${ICON_DIR}/${size}/apps RENAME ${brandedName})
 	ENDFOREACH(file)
     ENDFOREACH(size)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git