X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2FCMakeLists.txt;h=244d394104eaaf300fafe732372148096c7ba2f4;hp=75982d11d34407cf1246fa35438162484aa0a5ee;hb=0de0a17782cf478d638a532f36898197af88e0bc;hpb=f64d4eec4bba63ececdece95f5c73b0ac550acd4 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 75982d11..244d3941 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,7 +38,7 @@ 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_dependencies(quasselcore po) set_target_properties(quasselcore PROPERTIES COMPILE_FLAGS "-DBUILD_CORE ${QUASSEL_QT_COMPILEFLAGS}" OUTPUT_NAME ../quasselcore) @@ -51,7 +51,7 @@ 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_dependencies(quasselclient po) set_target_properties(quasselclient PROPERTIES COMPILE_FLAGS "-DBUILD_QTUI ${QUASSEL_QT_COMPILEFLAGS} ${CLIENT_COMPILE_FLAGS}" OUTPUT_NAME ../quasselclient) @@ -63,11 +63,8 @@ endif(WANT_QTCLIENT) 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 ${COMMON_DEPS} ${CLIENT_DEPS} ${CORE_DEPS}) + add_dependencies(quassel po) set_target_properties(quassel PROPERTIES COMPILE_FLAGS "-DBUILD_MONO ${QUASSEL_QT_COMPILEFLAGS} ${CLIENT_COMPILE_FLAGS}" OUTPUT_NAME ../quassel)