X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2FCMakeLists.txt;h=0e3e2a1cb4e1dee8679537913134603e0260ed6b;hp=e5a5e41c2fd10b179190a92520529506f79b1689;hb=d20a7db77425fab0c44e5bf307ba0061ddaf9faf;hpb=d8d9cc49774faf66170790ea687c37584e5e7a51 diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index e5a5e41c..0e3e2a1c 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,8 +1,4 @@ # Builds the common module -if (QCA2_FOUND) - include_directories(${QCA2_INCLUDE_DIR}) -endif (QCA2_FOUND) - set(QT_DONT_USE_QTGUI 1) set(QT_USE_QTNETWORK 1) include(${QT_USE_FILE}) @@ -16,28 +12,27 @@ set(SOURCES bufferviewconfig.cpp bufferviewmanager.cpp cliparser.cpp + ctcpevent.cpp + event.cpp + eventmanager.cpp identity.cpp ignorelistmanager.cpp ircchannel.cpp + ircevent.cpp irclisthelper.cpp ircuser.cpp logger.cpp message.cpp + messageevent.cpp network.cpp networkconfig.cpp + networkevent.cpp quassel.cpp settings.cpp signalproxy.cpp syncableobject.cpp util.cpp) -if(CMAKE_HOST_WIN32) - set(SOURCES ${SOURCES} logbacktrace_win.cpp) -endif(CMAKE_HOST_WIN32) -if(CMAKE_HOST_UNIX) - set(SOURCES ${SOURCES} logbacktrace_unix.cpp) -endif(CMAKE_HOST_UNIX) - set(MOC_HDRS aliasmanager.h backlogmanager.h @@ -46,6 +41,7 @@ set(MOC_HDRS bufferviewconfig.h bufferviewmanager.h coreinfo.h + eventmanager.h identity.h ignorelistmanager.h ircchannel.h @@ -61,6 +57,11 @@ set(HEADERS ${MOC_HDRS} abstractcliparser.h bufferinfo.h cliparser.h + ctcpevent.h + event.h + ircevent.h + networkevent.h + messageevent.h logger.h message.h types.h @@ -71,6 +72,13 @@ if(APPLE) set(HEADERS ${HEADERS} mac_utils.h) endif(APPLE) +if(CMAKE_HOST_WIN32) + set(SOURCES ${SOURCES} logbacktrace_win.cpp) +endif(CMAKE_HOST_WIN32) +if(CMAKE_HOST_UNIX) + set(SOURCES ${SOURCES} logbacktrace_unix.cpp) +endif(CMAKE_HOST_UNIX) + qt4_wrap_cpp(MOC ${MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) # for version.inc and version.gen @@ -82,13 +90,4 @@ if(APPLE) target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation") endif(APPLE) -if (QCA2_FOUND) - target_link_libraries(mod_common ${QCA2_LIBRARIES}) -endif (QCA2_FOUND) - -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - find_library(libdl dl) - if(NOT libdl MATCHES "NOTFOUND") - target_link_libraries(mod_common ${libdl}) - endif(NOT libdl MATCHES "NOTFOUND") -endif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") +target_link_libraries(mod_common ${CMAKE_DL_LIBS})