projects / quassel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f69b06)
Some changes for make install
authorPatrick von Reth <patrick.vonreth@gmail.com>
Mon, 1 Feb 2010 08:20:28 +0000 (09:20 +0100)
committerManuel Nickschas <sputnick@quassel-irc.org>
Tue, 16 Feb 2010 10:49:32 +0000 (11:49 +0100)
Enable installation of notifyrc and .desktop on windows and mac if built with -DWITH_KDE=ON

data/CMakeLists.txt patch | blob | history
icons/CMakeLists.txt patch | blob | history

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index ff667fb..b3d70ad 100644 (file)
--- 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)
   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)
       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)
 
 if(WANT_MONO OR WANT_QTCLIENT)
   if(EMBED_DATA)
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 0fda03e..085ca92 100644 (file)
--- 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
 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")
   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)
Quassel IRC