X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2FCMakeLists.txt;h=238cb8670d147b27d2d99eefd9d3da40cf85058a;hp=d165e6268e795f19f3f2a5afbb3476cea7f0a32b;hb=ac654fdeeece68d64561920479f064ad3c237e26;hpb=168309311415f27f1c7015805637b50a01b43c1e

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d165e626..238cb867 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,45 +1,46 @@
 # Builds the three main targets
 
-# Define resources for icons and pics, if needed
-# We always add stuff in :/pics
-qt4_add_resources(CLIENT_DEPS ../pics/pics.qrc)
-
-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)
-  add_definitions(-DQUASSEL_ICONS_BUILTIN)
-endif(QUASSEL_ICONS MATCHES "Builtin")
-
-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)
-  add_definitions(-DOXYGEN_ICONS_BUILTIN)
-endif(OXYGEN_ICONS MATCHES "Builtin")
-
-# Now it's time to build the modules...
-
 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)
+
+  if(STATIC)
+    link_directories(${QT_PLUGINS_DIR}/imageformats)
+    set(CLIENT_LIBS ${CLIENT_LIBS} qjpeg qgif)
+  endif(STATIC)
+endif(BUILD_GUI)
+
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen
 
-# ... and finally the executables
+# 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)
 
 if(WANT_CORE)
-  setup_qt4_variables(NETWORK SCRIPT SQL)
+  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)
   set_target_properties(quasselcore PROPERTIES
-                                    COMPILE_FLAGS "-DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_CORE"
+                                    COMPILE_FLAGS "-DBUILD_CORE ${QUASSEL_QT_COMPILEFLAGS}"
                                     OUTPUT_NAME ../quasselcore)
   target_link_libraries(quasselcore mod_core mod_common
                                     ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
@@ -47,26 +48,31 @@ if(WANT_CORE)
 endif(WANT_CORE)
 
 if(WANT_QTCLIENT)
-  setup_qt4_variables(${LINK_DBUS} GUI NETWORK ${LINK_WEBKIT})
+  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 icons)
+  add_dependencies(quasselclient po genversion_run)
   set_target_properties(quasselclient PROPERTIES
-                                      COMPILE_FLAGS "-DQT_GUI_LIB -DQT_NETWORK_LIB -DBUILD_QTUI"
+                                      COMPILE_FLAGS "-DBUILD_QTUI ${QUASSEL_QT_COMPILEFLAGS} ${CLIENT_COMPILE_FLAGS}"
                                       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 ${LINK_KDE} mod_qtui mod_uisupport mod_client mod_common ${CLIENT_LIBS}
+                                      ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${CLIENT_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})
-  add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${COMMON_DEPS} ${CLIENT_DEPS} ${CORE_DEPS})
-  add_dependencies(quassel icons)
+  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)
   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 ${QUASSEL_QT_COMPILEFLAGS} ${CLIENT_COMPILE_FLAGS}"
                                 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 ${CLIENT_LIBS}
+                                ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${CLIENT_LIBRARIES})
   install(TARGETS quassel RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 endif(WANT_MONO)