X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2FCMakeLists.txt;h=238cb8670d147b27d2d99eefd9d3da40cf85058a;hp=5bfc9407a925297f44f7c24d10f1e33b2e315fb7;hb=800b9cc3f9730953c74156f31aeff4d59ec7bade;hpb=5cfabc7f10123e0e4f03f76ef8ecbdd6c36df511 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5bfc9407..238cb867 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,62 +1,78 @@ # 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) -# We always add stuff in :/pics -qt4_add_resources(CLIENT_DEPS ../pics/pics.qrc) + if(STATIC) + link_directories(${QT_PLUGINS_DIR}/imageformats) + set(CLIENT_LIBS ${CLIENT_LIBS} qjpeg qgif) + endif(STATIC) +endif(BUILD_GUI) -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") +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) # for version.gen -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") +# 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}) install(TARGETS quasselcore RUNTIME DESTINATION ${BIN_INSTALL_DIR}) endif(WANT_CORE) if(WANT_QTCLIENT) - setup_qt4_variables(${LINK_DBUS} GUI NETWORK) + 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") - target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common - ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES}) + 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 ${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) - 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") - target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common - ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES}) + 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 ${CLIENT_LIBS} + ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES} ${CLIENT_LIBRARIES}) install(TARGETS quassel RUNTIME DESTINATION ${BIN_INSTALL_DIR}) endif(WANT_MONO) @@ -64,14 +80,14 @@ endif(WANT_MONO) if(APPLE) add_custom_command(TARGET quasselclient POST_BUILD COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py - ${CMAKE_SOURCE_DIR} "Quassel Client" quasselclient) + ${CMAKE_SOURCE_DIR} "Quassel Client" ../quasselclient) add_custom_command(TARGET quassel POST_BUILD COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py - ${CMAKE_SOURCE_DIR} "Quassel" quassel) + ${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 ..) add_custom_command(TARGET quasselcore POST_BUILD - COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core) + COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..) endif(DEPLOY) endif(APPLE)