projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Strip formatting when looking up the clickable.
[quassel.git]
/
data
/
CMakeLists.txt
diff --git
a/data/CMakeLists.txt
b/data/CMakeLists.txt
index
5c0b9d1
..
f516018
100644
(file)
--- a/
data/CMakeLists.txt
+++ b/
data/CMakeLists.txt
@@
-1,4
+1,7
@@
-if(NOT WIN32 AND NOT APPLE)
+# 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)
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,13
+15,17
@@
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)
+ endif(HAVE_KDE OR NOT APPLE)
+endif(HAVE_KDE OR UNIX)
if(WANT_MONO OR WANT_QTCLIENT)
if(EMBED_DATA)
set(CLIENT_RCS ${CLIENT_RCS} ../data/data.qrc PARENT_SCOPE)
else(EMBED_DATA)
if(WANT_MONO OR WANT_QTCLIENT)
if(EMBED_DATA)
set(CLIENT_RCS ${CLIENT_RCS} ../data/data.qrc PARENT_SCOPE)
else(EMBED_DATA)
- install(FILES default.qss networks.ini DESTINATION ${DATA_INSTALL_DIR}/quassel)
+ install(FILES networks.ini DESTINATION ${DATA_INSTALL_DIR}/quassel)
+ install(DIRECTORY stylesheets DESTINATION ${DATA_INSTALL_DIR}/quassel)
endif(EMBED_DATA)
if(NOT WIN32)
endif(EMBED_DATA)
if(NOT WIN32)