From f0efd6b5fa2839c9290a36c5a0397f439166f532 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 29 Apr 2017 17:04:57 +0200 Subject: [PATCH 1/1] Only install the application icon if the client is being built The icon should not be installed as part of a core-only build. Closes GH-292. --- icons/CMakeLists.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 4ae47d5c..89b286c1 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -54,13 +54,12 @@ if (WANT_MONO OR WANT_QTCLIENT) endif() set(CLIENT_RCS ${CLIENT_RCS} ${ICON_RCS} PARENT_SCOPE) -endif() - -# Application icon -if (HAVE_KDE OR (UNIX AND NOT APPLE)) - install(FILES hicolor/48x48/apps/quassel.png DESTINATION ${CMAKE_INSTALL_ICONDIR}/hicolor/48x48/apps) - if (CMAKE_INSTALL_PREFIX STREQUAL "/usr") - install(FILES hicolor/48x48/apps/quassel.png DESTINATION /usr/share/pixmaps) + # Application icon + if (HAVE_KDE OR (UNIX AND NOT APPLE)) + install(FILES hicolor/48x48/apps/quassel.png DESTINATION ${CMAKE_INSTALL_ICONDIR}/hicolor/48x48/apps) + if (CMAKE_INSTALL_PREFIX STREQUAL "/usr") + install(FILES hicolor/48x48/apps/quassel.png DESTINATION /usr/share/pixmaps) + endif() endif() endif() -- 2.20.1