X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2FCMakeLists.txt;h=8690625e2745da3b464bbfdad8aebed1a7c8fde9;hb=0de0a17782cf478d638a532f36898197af88e0bc;hp=18e6fcf4b024525f448838b9e8e652d81fe09a41;hpb=fd25e92f19d6afd4eb02844bcbf20ba132868303;p=quassel.git diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 18e6fcf4..8690625e 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -4,6 +4,7 @@ setup_qt_variables(Core Network) set(SOURCES aliasmanager.cpp + authhandler.cpp backlogmanager.cpp basichandler.cpp bufferinfo.cpp @@ -11,7 +12,7 @@ set(SOURCES bufferviewconfig.cpp bufferviewmanager.cpp cliparser.cpp - coreinfo.cpp + compressor.cpp ctcpevent.cpp event.cpp eventmanager.cpp @@ -29,65 +30,34 @@ set(SOURCES networkconfig.cpp networkevent.cpp peer.cpp + peerfactory.cpp quassel.cpp remotepeer.cpp settings.cpp signalproxy.cpp syncableobject.cpp + transfer.cpp + transfermanager.cpp util.cpp + protocols/datastream/datastreampeer.cpp protocols/legacy/legacypeer.cpp -) -set(MOC_HDRS - aliasmanager.h - backlogmanager.h - basichandler.h - buffersyncer.h - bufferviewconfig.h - bufferviewmanager.h + # needed for automoc coreinfo.h - eventmanager.h - identity.h - ignorelistmanager.h - internalpeer.h - ircchannel.h - irclisthelper.h - ircuser.h - network.h - networkconfig.h - peer.h - remotepeer.h - settings.h - signalproxy.h - syncableobject.h - - protocols/legacy/legacypeer.h ) -set(HEADERS ${MOC_HDRS} - abstractcliparser.h - bufferinfo.h - cliparser.h - ctcpevent.h - event.h - ircevent.h - messageevent.h - networkevent.h - logger.h - message.h - protocol.h - types.h - util.h) if (HAVE_QCA2) set(SOURCES ${SOURCES} keyevent.cpp) - set(HEADERS ${HEADERS} keyevent.h) endif(HAVE_QCA2) +if(NOT HAVE_ZLIB) + set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c) +endif(NOT HAVE_ZLIB) + if(APPLE) set(SOURCES ${SOURCES} mac_utils.cpp) - set(HEADERS ${HEADERS} mac_utils.h) endif(APPLE) if(CMAKE_HOST_WIN32) @@ -97,15 +67,9 @@ if(CMAKE_HOST_UNIX) set(SOURCES ${SOURCES} logbacktrace_unix.cpp) endif(CMAKE_HOST_UNIX) -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${QUASSEL_QT_INCLUDES}) # for version.inc and version.gen - -if(NOT WITH_QT5) - qt4_wrap_cpp(MOC ${MOC_HDRS}) -endif(NOT WITH_QT5) - -set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES version.gen) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QUASSEL_QT_INCLUDES}) # for version.inc and version.gen -add_library(mod_common STATIC ${SOURCES} ${HEADERS} ${MOC}) +add_library(mod_common STATIC ${SOURCES}) set_target_properties(mod_common PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}") if(APPLE)