X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2FCMakeLists.txt;h=96b66af1b7db2f298ad809334811a01b5f3d5ad6;hp=a644934fd0a23231f42317399e1357d072dc6cd8;hb=c27d5bfbe80bfeb583a25404f4ccee4b70b010e0;hpb=b6cb2c68d2a39f2a2d08cacf4fe7373e27a649e9

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a644934f..96b66af1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(BEFORE common)
 if(BUILD_CORE)
   add_subdirectory(core)
   include_directories(BEFORE core)
-endif(BUILD_CORE)
+endif()
 if(BUILD_GUI)
   add_subdirectory(client)
   add_subdirectory(uisupport)
@@ -17,8 +17,8 @@ if(BUILD_GUI)
   if(STATIC)
     link_directories(${QT_PLUGINS_DIR}/imageformats)
     set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} qjpeg qgif)
-  endif(STATIC)
-endif(BUILD_GUI)
+  endif()
+endif()
 
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
 
@@ -26,8 +26,10 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
 if (EMBED_DATA)
     add_definitions(-DEMBED_DATA)
 endif()
-if (WITH_OXYGEN)
-    add_definitions(-DWITH_OXYGEN)
+
+# For KAboutData
+if (WITH_KF5)
+    set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} KF5::CoreAddons)
 endif()
 
 # Needed for showing the cli option if appropriate
@@ -43,8 +45,8 @@ if(WANT_CORE)
                                     COMPILE_FLAGS "-DBUILD_CORE"
                                     OUTPUT_NAME ../quasselcore)
   target_link_libraries(quasselcore mod_core mod_common ${COMMON_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY})
-  install(TARGETS quasselcore RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-endif(WANT_CORE)
+  install(TARGETS quasselcore RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 if (KDE4_FOUND)
     include_directories(${KDE4_INCLUDES})
@@ -58,8 +60,8 @@ if(WANT_QTCLIENT)
                                       COMPILE_FLAGS "-DBUILD_QTUI"
                                       OUTPUT_NAME ../quasselclient)
   target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common ${COMMON_LIBRARIES} ${CLIENT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY})
-  install(TARGETS quasselclient RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-endif(WANT_QTCLIENT)
+  install(TARGETS quasselclient RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 if(WANT_MONO)
   add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${CLIENT_DEPS} ${CORE_DEPS} ${COMMON_DEPS})
@@ -69,8 +71,8 @@ if(WANT_MONO)
                                 COMPILE_FLAGS "-DBUILD_MONO"
                                 OUTPUT_NAME ../quassel)
   target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common ${COMMON_LIBRARIES} ${CLIENT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY})
-  install(TARGETS quassel RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-endif(WANT_MONO)
+  install(TARGETS quassel RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 # Build bundles for MacOSX
 if(APPLE)
@@ -82,8 +84,10 @@ if(APPLE)
                              ${CMAKE_SOURCE_DIR} "Quassel" ../quassel)
   if(DEPLOY)
     add_custom_command(TARGET quasselclient POST_BUILD
-                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client ..)
+                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client .. qsvgicon)
     add_custom_command(TARGET quasselcore POST_BUILD
                        COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..)
-  endif(DEPLOY)
-endif(APPLE)
+    add_custom_command(TARGET quassel POST_BUILD
+                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Mono .. qsvgicon)
+  endif()
+endif()