X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=cff7f94ca22f52042ebcc96f3769ba6d3c5b939a;hb=622ae84876eaab27ab232ee72e97e090b0aa57c0;hp=59facd848d464d8822ad181c3b0d336d1c6f5d3b;hpb=f6cc3c4c662771d76355f876dd6e0317b890676b;p=quassel.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 59facd84..cff7f94c 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
 
@@ -30,6 +30,11 @@ if (WITH_OXYGEN)
     add_definitions(-DWITH_OXYGEN)
 endif()
 
+# For KAboutData
+if (WITH_KF5)
+    set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} KF5::CoreAddons)
+endif()
+
 # Needed for showing the cli option if appropriate
 if (HAVE_SYSLOG)
     add_definitions(-DHAVE_SYSLOG)
@@ -43,8 +48,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 +63,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 +74,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)
@@ -87,5 +92,5 @@ if(APPLE)
                        COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..)
     add_custom_command(TARGET quasselcore POST_BUILD
                        COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Mono ..)
-  endif(DEPLOY)
-endif(APPLE)
+  endif()
+endif()