X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2FCMakeLists.txt;h=b27a2f12e50f7dd3d1aa462d8d0a44754e78862a;hb=d3c9d89989df59c073fc33637ba4e8bbdb6ab397;hp=9d0af6eea581ae4228b0cf80f9fd40eab1e864ad;hpb=73146d4eb2334bd95f98d27dcd7fa3d7cea4adc3;p=quassel.git diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 9d0af6ee..b27a2f12 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,5 +1,4 @@ # Builds the common module - set(QT_DONT_USE_QTGUI 1) set(QT_USE_QTNETWORK 1) include(${QT_USE_FILE}) @@ -7,11 +6,14 @@ include(${QT_USE_FILE}) set(SOURCES aliasmanager.cpp backlogmanager.cpp + basichandler.cpp bufferinfo.cpp buffersyncer.cpp bufferviewconfig.cpp bufferviewmanager.cpp cliparser.cpp + event.cpp + eventmanager.cpp identity.cpp ignorelistmanager.cpp ircchannel.cpp @@ -27,20 +29,15 @@ set(SOURCES 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 + basichandler.h buffersyncer.h bufferviewconfig.h bufferviewmanager.h coreinfo.h + eventmanager.h identity.h ignorelistmanager.h ircchannel.h @@ -56,6 +53,7 @@ set(HEADERS ${MOC_HDRS} abstractcliparser.h bufferinfo.h cliparser.h + event.h logger.h message.h types.h @@ -66,6 +64,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 @@ -77,11 +82,9 @@ if(APPLE) target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation") endif(APPLE) -if(CMAKE_HOST_UNIX) - find_library(libdl dl) - if (libdl-NOTFOUND) - message(FATAL_ERROR "Cannot find required library: libdl") - endif (libdl-NOTFOUND) - +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + find_library(libdl dl) + if(NOT libdl MATCHES "NOTFOUND") target_link_libraries(mod_common ${libdl}) -endif(CMAKE_HOST_UNIX) + endif(NOT libdl MATCHES "NOTFOUND") +endif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")