projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: avoid de-duplication of user's CXXFLAGS
[quassel.git]
/
icons
/
CMakeLists.txt
diff --git
a/icons/CMakeLists.txt
b/icons/CMakeLists.txt
index
4780efc
..
e6b70a4
100644
(file)
--- a/
icons/CMakeLists.txt
+++ b/
icons/CMakeLists.txt
@@
-9,7
+9,7
@@
if (WANT_MONO OR WANT_QTCLIENT)
# Always embed a hicolor fallback containing the most important (e.g. tray) icons.
# The .qrc contains aliases, so it's best to keep this manually written rather than autogenerated.
# Always embed a hicolor fallback containing the most important (e.g. tray) icons.
# The .qrc contains aliases, so it's best to keep this manually written rather than autogenerated.
- quassel_add_module(Resource::HicolorIcons)
+ quassel_add_module(Resource::HicolorIcons
STATIC
)
target_sources(${TARGET} PRIVATE hicolor_icons.qrc)
set_target_properties(${TARGET} PROPERTIES AUTOMOC OFF AUTOUIC OFF)
target_sources(${TARGET} PRIVATE hicolor_icons.qrc)
set_target_properties(${TARGET} PROPERTIES AUTOMOC OFF AUTOUIC OFF)
@@
-64,10
+64,5
@@
if (WANT_MONO OR WANT_QTCLIENT)
# Install Quassel-specific ones from Oxygen into hicolor as fallback
install(DIRECTORY oxygen/ DESTINATION ${CMAKE_INSTALL_ICONDIR}/hicolor)
endif()
# Install Quassel-specific ones from Oxygen into hicolor as fallback
install(DIRECTORY oxygen/ DESTINATION ${CMAKE_INSTALL_ICONDIR}/hicolor)
endif()
-
- # For a system install, also copy to pixmaps
- if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
- install(FILES hicolor/48x48/apps/quassel.png DESTINATION /usr/share/pixmaps)
- endif()
endif()
endif()
endif()
endif()