Fix icons missing if data files are embedded
authorManuel Nickschas <sputnick@quassel-irc.org>
Wed, 2 Sep 2009 11:01:54 +0000 (13:01 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Wed, 2 Sep 2009 11:01:54 +0000 (13:01 +0200)
Note to self: PARENT_SCOPE doesn't behave like one would expect.

icons/CMakeLists.txt

index e6cf981..49066d3 100644 (file)
@@ -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)