X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2FCMakeLists.txt;h=8beb17c0f320aa9a1abe28bff1267b942775f59b;hp=75982d11d34407cf1246fa35438162484aa0a5ee;hb=0216d4a650c02155b5bcd517567209f674d8a120;hpb=f64d4eec4bba63ececdece95f5c73b0ac550acd4

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 75982d11..8beb17c0 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,64 +17,58 @@ 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
 
-# Add resources. Can't be done in other subdirs apparently.
-# Note that these variables need to contain paths relative to src/ (this dir)
-if(WITH_QT5)
-  qt5_add_resources(CLIENT_DEPS ${CLIENT_RCS})
-  qt5_add_resources(CORE_DEPS ${CORE_RCS})
-  qt5_add_resources(COMMON_DEPS ${COMMON_RCS})
-else(WITH_QT5)
-  qt4_add_resources(CLIENT_DEPS ${CLIENT_RCS})
-  qt4_add_resources(CORE_DEPS ${CORE_RCS})
-  qt4_add_resources(COMMON_DEPS ${COMMON_RCS})
-endif(WITH_QT5)
+# We need to initialize the appropriate resources, so let's give our main.cpp some hints
+if (EMBED_DATA)
+    add_definitions(-DEMBED_DATA)
+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)
+endif()
 
 if(WANT_CORE)
-  setup_qt_variables(Network Script Sql ${CORE_QT_MODULES})
-  include_directories(${QUASSEL_QT_INCLUDES})
-  add_executable(quasselcore common/main.cpp ${COMMON_DEPS} ${CORE_DEPS})
-  add_dependencies(quasselcore po genversion_run)
+  add_executable(quasselcore common/main.cpp ${CORE_DEPS} ${COMMON_DEPS})
+  qt5_use_modules(quasselcore Core Network ${CORE_QT_MODULES})
+  add_dependencies(quasselcore po)
   set_target_properties(quasselcore PROPERTIES
-                                    COMPILE_FLAGS "-DBUILD_CORE ${QUASSEL_QT_COMPILEFLAGS}"
-                                    OUTPUT_NAME ../quasselcore)
-  target_link_libraries(quasselcore mod_core mod_common ${COMMON_LIBRARIES}
-                                    ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
-  install(TARGETS quasselcore RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-endif(WANT_CORE)
+                                    COMPILE_FLAGS "-DBUILD_CORE"
+                                    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+  target_link_libraries(quasselcore mod_core mod_common ${COMMON_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+  install(TARGETS quasselcore RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 if(WANT_QTCLIENT)
-  setup_qt_variables(Gui Network ${CLIENT_QT_MODULES})
-  include_directories(${QUASSEL_QT_INCLUDES})
-  add_executable(quasselclient WIN32 common/main.cpp ${COMMON_DEPS} ${CLIENT_DEPS})
-  add_dependencies(quasselclient po genversion_run)
+  add_executable(quasselclient WIN32 common/main.cpp ${CLIENT_DEPS} ${COMMON_DEPS})
+  qt5_use_modules(quasselclient Core Gui Network ${CLIENT_QT_MODULES})
+  add_dependencies(quasselclient po)
   set_target_properties(quasselclient PROPERTIES
-                                      COMPILE_FLAGS "-DBUILD_QTUI ${QUASSEL_QT_COMPILEFLAGS} ${CLIENT_COMPILE_FLAGS}"
-                                      OUTPUT_NAME ../quasselclient)
-  target_link_libraries(quasselclient ${LINK_KDE} mod_qtui mod_uisupport mod_client mod_common ${COMMON_LIBRARIES}
-                                      ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${CLIENT_LIBRARIES})
-  install(TARGETS quasselclient RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-endif(WANT_QTCLIENT)
+                                      COMPILE_FLAGS "-DBUILD_QTUI"
+                                      RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+  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 ${CMAKE_INSTALL_BINDIR})
+endif()
 
 if(WANT_MONO)
-  setup_qt_variables(Gui Network Script Sql ${CLIENT_QT_MODULES} ${CORE_QT_MODULES})
-  include_directories(${QUASSEL_QT_INCLUDES})
-  if(NOT WITH_QT5)
-    qt4_wrap_cpp(MOC qtui/monoapplication.h)
-  endif(NOT WITH_QT5)
-  add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${MOC} ${COMMON_DEPS} ${CLIENT_DEPS} ${CORE_DEPS})
-  add_dependencies(quassel po genversion_run)
+  add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${CLIENT_DEPS} ${CORE_DEPS} ${COMMON_DEPS})
+  qt5_use_modules(quassel Core Gui Network ${CLIENT_QT_MODULES} ${CORE_QT_MODULES})
+  add_dependencies(quassel po)
   set_target_properties(quassel PROPERTIES
-                                COMPILE_FLAGS "-DBUILD_MONO ${QUASSEL_QT_COMPILEFLAGS} ${CLIENT_COMPILE_FLAGS}"
-                                OUTPUT_NAME ../quassel)
-  target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common ${COMMON_LIBRARIES}
-                                ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${CLIENT_LIBRARIES})
-  install(TARGETS quassel RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-endif(WANT_MONO)
+                                COMPILE_FLAGS "-DBUILD_MONO"
+                                RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+  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 ${CMAKE_INSTALL_BINDIR})
+endif()
 
 # Build bundles for MacOSX
 if(APPLE)
@@ -86,8 +80,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()