# Figure out if we want to install KDE's icons
# Starting with KDE 4.3, they shouldn't be needed anymore
+ set(INSTALL_OXY true)
string(TOUPPER ${WITH_OXYGEN} OXY_UPPER)
if(NOT OXY_UPPER)
set(INSTALL_OXY false)
elseif(OXY_UPPER MATCHES "AUTO")
- if(HAVE_KDE AND KDE_VERSION VERSION_GREATER 4.2.99)
- set(INSTALL_OXY false)
- else(HAVE_KDE AND KDE_VERSION VERSION_GREATER 4.2.99)
- set(INSTALL_OXY true)
- endif(HAVE_KDE AND KDE_VERSION VERSION_GREATER 4.2.99)
- else(NOT OXY_UPPER)
- set(INSTALL_OXY true)
+ if(HAVE_KDE)
+ if(KDE_VERSION VERSION_GREATER 4.2.99)
+ set(INSTALL_OXY false)
+ endif(KDE_VERSION VERSION_GREATER 4.2.99)
+ endif(HAVE_KDE)
endif(NOT OXY_UPPER)
if(INSTALL_OXY)
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 hicolor DESTINATION ${ICON_INSTALL_DIR})
install(DIRECTORY oxygen DESTINATION ${DATA_INSTALL_DIR}/quassel/icons)
if(INSTALL_OXY)
install(DIRECTORY oxygen_kde/ DESTINATION ${DATA_INSTALL_DIR}/quassel/icons/oxygen)
endif(WANT_MONO OR WANT_QTCLIENT)
# Application icon
-if(NOT APPLE AND NOT WIN32)
+
+# cmake-2.6.2 can't handle nested conditions
+# if((UNIX AND NOT APPLE) OR HAVE_KDE)
+if(HAVE_KDE OR UNIX)
+ if(HAVE_KDE OR NOT APPLE)
+
install(FILES oxygen_kde/48x48/apps/quassel.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps)
if(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
install(FILES oxygen_kde/48x48/apps/quassel.png DESTINATION /usr/share/pixmaps)
endif(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
-endif(NOT APPLE AND NOT WIN32)
+
+# endif((UNIX AND NOT APPLE) OR HAVE_KDE)
+ endif(HAVE_KDE OR NOT APPLE)
+endif(HAVE_KDE OR UNIX)