X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2FCMakeLists.txt;h=661d10c1395e301682d9ccd388d3b13c655ffade;hp=32b5370883cbee41d7a17bd39cce2d2e97574111;hb=0216d4a650c02155b5bcd517567209f674d8a120;hpb=c015fbf8afaf64fbb5a8e2122e2a1ecf0325b1a1 diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 32b53708..661d10c1 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -37,6 +37,7 @@ set(SOURCES peer.cpp peerfactory.cpp presetnetworks.cpp + qt5cliparser.cpp quassel.cpp remotepeer.cpp settings.cpp @@ -58,13 +59,7 @@ set(SOURCES protocol.h ) -if (USE_QT5) - list(APPEND SOURCES qt5cliparser.cpp) -else() - list(APPEND SOURCES cliparser.cpp) -endif() - -if (QCA2_FOUND OR QCA2-QT5_FOUND) +if (QCA2-QT5_FOUND) set(SOURCES ${SOURCES} keyevent.cpp) endif() @@ -75,10 +70,6 @@ else() set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c) endif() -if (USE_QT4) - set(SOURCES ${SOURCES} ../../3rdparty/sha512/sha512.c) -endif() - if (HAVE_SYSLOG) add_definitions(-DHAVE_SYSLOG) endif() @@ -97,10 +88,10 @@ else() set(SOURCES ${SOURCES} logbacktrace_unix.cpp posixsignalwatcher.cpp) endif() -qt_add_resources(SOURCES ${COMMON_RCS}) +qt5_add_resources(SOURCES ${COMMON_RCS}) add_library(mod_common STATIC ${SOURCES}) -qt_use_modules(mod_common Core Network) +qt5_use_modules(mod_common Core Network) if (APPLE) target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")