From 7a68d46fd695fd42cd234ed908abeb1ab36171c9 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 2 Sep 2009 13:01:54 +0200 Subject: [PATCH 1/1] Fix icons missing if data files are embedded Note to self: PARENT_SCOPE doesn't behave like one would expect. --- icons/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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) -- 2.20.1