From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 2 Sep 2009 11:01:54 +0000 (+0200)
Subject: Fix icons missing if data files are embedded
X-Git-Tag: 0.5-rc2~83
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7a68d46fd695fd42cd234ed908abeb1ab36171c9

Fix icons missing if data files are embedded

Note to self: PARENT_SCOPE doesn't behave like one would expect.
---

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index e6cf981c..49066d3f 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -26,10 +26,11 @@ if(WANT_MONO OR WANT_QTCLIENT)
   endif(INSTALL_OXY)
 
   if(EMBED_DATA)
-    set(CLIENT_RCS ${CLIENT_RCS} ../icons/hicolor.qrc ../icons/oxygen.qrc PARENT_SCOPE)
+    set(ICON_RCS ../icons/hicolor.qrc ../icons/oxygen.qrc)
     if(INSTALL_OXY)
-      set(CLIENT_RCS ${CLIENT_RCS} ../icons/oxygen_kde.qrc PARENT_SCOPE)
+      set(ICON_RCS ${ICON_RCS} ../icons/oxygen_kde.qrc)
     endif(INSTALL_OXY)
+    set(CLIENT_RCS ${CLIENT_RCS} ${ICON_RCS} PARENT_SCOPE)
   else(EMBED_DATA)
     install(DIRECTORY hicolor DESTINATION ${DATA_INSTALL_DIR}/quassel/icons)
     install(DIRECTORY oxygen DESTINATION ${DATA_INSTALL_DIR}/quassel/icons)