X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2FCMakeLists.txt;h=5a7f9f70de7748f609d7e777aab9634cf2a9fbcb;hp=da979d593a5932fb16c23f8b2f817a0456b16055;hb=307a54f216ad4510ec8e53cb85cf3f679dfb44c5;hpb=299541db5d6586c0b09e036816dfd28477ebc249

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index da979d59..5a7f9f70 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,69 +1,72 @@
 # Builds the three main targets
 
 add_subdirectory(common)
-include_directories(common)
-if(WANT_CORE OR WANT_MONO)
+include_directories(BEFORE common)
+if(BUILD_CORE)
   add_subdirectory(core)
-  include_directories(core)
-endif(WANT_CORE OR WANT_MONO)
-if(WANT_QTCLIENT OR WANT_MONO)
+  include_directories(BEFORE core)
+endif(BUILD_CORE)
+if(BUILD_GUI)
   add_subdirectory(client)
   add_subdirectory(uisupport)
   add_subdirectory(qtui)
-  include_directories(client)
-  include_directories(uisupport)
-  include_directories(qtui)
-endif(WANT_QTCLIENT OR WANT_MONO)
+  include_directories(BEFORE client)
+  include_directories(BEFORE uisupport)
+  include_directories(BEFORE qtui)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
+  if(STATIC)
+    link_directories(${QT_PLUGINS_DIR}/imageformats)
+    set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} qjpeg qgif)
+  endif(STATIC)
+endif(BUILD_GUI)
 
-# We always add stuff in :/pics
-qt4_add_resources(CLIENT_DEPS ../pics/pics.qrc)
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
 
-if(QUASSEL_ICONS MATCHES "Builtin")
-  set(CLIENT_DEPS ${CLIENT_DEPS} ../icons/qrc_hicolor.cxx)
-  set_source_files_properties(../icons/qrc_hicolor.cxx PROPERTIES GENERATED true)
-endif(QUASSEL_ICONS MATCHES "Builtin")
+# Add resources. Can't be done in other subdirs apparently.
+# Note that these variables need to contain paths relative to src/ (this dir)
+qt_add_resources(CLIENT_DEPS ${CLIENT_RCS})
+qt_add_resources(CORE_DEPS ${CORE_RCS})
+qt_add_resources(COMMON_DEPS ${COMMON_RCS})
 
-if(OXYGEN_ICONS MATCHES "Builtin")
-  set(CLIENT_DEPS ${CLIENT_DEPS} ../icons/qrc_oxygen.cxx)
-  set_source_files_properties(../icons/qrc_oxygen.cxx PROPERTIES GENERATED true)
-endif(OXYGEN_ICONS MATCHES "Builtin")
+# For Windows, Qt4 needs the QtMain module
+if (WIN32 AND NOT USE_QT5)
+    set(MAIN Main)
+endif()
 
 if(WANT_CORE)
-  setup_qt4_variables(NETWORK SCRIPT SQL)
   add_executable(quasselcore common/main.cpp ${COMMON_DEPS} ${CORE_DEPS})
-  add_dependencies(quasselcore genversion_run)
+  qt_use_modules(quasselcore Core Network ${CORE_QT_MODULES} ${MAIN})
+  add_dependencies(quasselcore po)
   set_target_properties(quasselcore PROPERTIES
-                                    COMPILE_FLAGS "-DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_CORE"
+                                    COMPILE_FLAGS "-DBUILD_CORE"
                                     OUTPUT_NAME ../quasselcore)
-  target_link_libraries(quasselcore mod_core mod_common
-                                    ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
+  target_link_libraries(quasselcore mod_core mod_common ${COMMON_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
   install(TARGETS quasselcore RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 endif(WANT_CORE)
 
+if (KDE4_FOUND)
+    include_directories(${KDE4_INCLUDES})
+endif()
+
 if(WANT_QTCLIENT)
-  setup_qt4_variables(${LINK_DBUS} GUI NETWORK ${LINK_WEBKIT})
   add_executable(quasselclient WIN32 common/main.cpp ${COMMON_DEPS} ${CLIENT_DEPS})
-  add_dependencies(quasselclient icons genversion_run)
+  qt_use_modules(quasselclient Core Gui Network ${CLIENT_QT_MODULES} ${MAIN})
+  add_dependencies(quasselclient po)
   set_target_properties(quasselclient PROPERTIES
-                                      COMPILE_FLAGS "-DQT_GUI_LIB -DQT_NETWORK_LIB -DBUILD_QTUI"
+                                      COMPILE_FLAGS "-DBUILD_QTUI"
                                       OUTPUT_NAME ../quasselclient)
-  target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common
-                                      ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
+  target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common ${COMMON_LIBRARIES} ${CLIENT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
   install(TARGETS quasselclient RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 endif(WANT_QTCLIENT)
 
 if(WANT_MONO)
-  setup_qt4_variables(${LINK_DBUS} GUI NETWORK SCRIPT SQL ${LINK_WEBKIT})
-  qt4_wrap_cpp(MOC qtui/monoapplication.h)
-  add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${MOC} ${COMMON_DEPS} ${CLIENT_DEPS} ${CORE_DEPS})
-  add_dependencies(quassel icons genversion_run)
+  add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${COMMON_DEPS} ${CLIENT_DEPS} ${CORE_DEPS})
+  qt_use_modules(quassel Core Gui Network ${CLIENT_QT_MODULES} ${CORE_QT_MODULES} ${MAIN})
+  add_dependencies(quassel po)
   set_target_properties(quassel PROPERTIES
-                                COMPILE_FLAGS "-DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_MONO"
+                                COMPILE_FLAGS "-DBUILD_MONO"
                                 OUTPUT_NAME ../quassel)
-  target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common
-                                ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
+  target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common ${COMMON_LIBRARIES} ${CLIENT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
   install(TARGETS quassel RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 endif(WANT_MONO)