From: Patrick von Reth Date: Mon, 1 Feb 2010 08:20:28 +0000 (+0100) Subject: Some changes for make install X-Git-Tag: 0.6-beta1~18 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1cb4bf57093cfc8fc25b27fd9060abe615e7bfda;ds=sidebyside Some changes for make install Enable installation of notifyrc and .desktop on windows and mac if built with -DWITH_KDE=ON --- diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index ff667fb5..b3d70adf 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,4 +1,4 @@ -if(NOT WIN32 AND NOT APPLE) +if((UNIX AND NOT APPLE) OR HAVE_KDE) if(WANT_QTCLIENT) install(FILES quasselclient.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) endif(WANT_QTCLIENT) @@ -12,7 +12,7 @@ if(NOT WIN32 AND NOT APPLE) install(FILES quassel.notifyrc DESTINATION ${DATA_INSTALL_DIR}/quassel) endif(HAVE_KDE) endif(WANT_MONO OR WANT_QTCLIENT) -endif(NOT WIN32 AND NOT APPLE) +endif((UNIX AND NOT APPLE) OR HAVE_KDE) if(WANT_MONO OR WANT_QTCLIENT) if(EMBED_DATA) diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 0fda03ea..085ca92c 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -40,9 +40,9 @@ if(WANT_MONO OR WANT_QTCLIENT) endif(WANT_MONO OR WANT_QTCLIENT) # Application icon -if(NOT APPLE AND NOT WIN32) +if((UNIX AND NOT APPLE) OR HAVE_KDE) 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)