projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use CMAKE_DL_LIBS
[quassel.git]
/
src
/
common
/
CMakeLists.txt
diff --git
a/src/common/CMakeLists.txt
b/src/common/CMakeLists.txt
index
30eed02
..
0e3e2a1
100644
(file)
--- a/
src/common/CMakeLists.txt
+++ b/
src/common/CMakeLists.txt
@@
-1,5
+1,4
@@
# Builds the common module
# Builds the common module
-
set(QT_DONT_USE_QTGUI 1)
set(QT_USE_QTNETWORK 1)
include(${QT_USE_FILE})
set(QT_DONT_USE_QTGUI 1)
set(QT_USE_QTNETWORK 1)
include(${QT_USE_FILE})
@@
-13,28
+12,27
@@
set(SOURCES
bufferviewconfig.cpp
bufferviewmanager.cpp
cliparser.cpp
bufferviewconfig.cpp
bufferviewmanager.cpp
cliparser.cpp
+ ctcpevent.cpp
+ event.cpp
+ eventmanager.cpp
identity.cpp
ignorelistmanager.cpp
ircchannel.cpp
identity.cpp
ignorelistmanager.cpp
ircchannel.cpp
+ ircevent.cpp
irclisthelper.cpp
ircuser.cpp
logger.cpp
message.cpp
irclisthelper.cpp
ircuser.cpp
logger.cpp
message.cpp
+ messageevent.cpp
network.cpp
networkconfig.cpp
network.cpp
networkconfig.cpp
+ networkevent.cpp
quassel.cpp
settings.cpp
signalproxy.cpp
syncableobject.cpp
util.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
set(MOC_HDRS
aliasmanager.h
backlogmanager.h
@@
-43,6
+41,7
@@
set(MOC_HDRS
bufferviewconfig.h
bufferviewmanager.h
coreinfo.h
bufferviewconfig.h
bufferviewmanager.h
coreinfo.h
+ eventmanager.h
identity.h
ignorelistmanager.h
ircchannel.h
identity.h
ignorelistmanager.h
ircchannel.h
@@
-58,6
+57,11
@@
set(HEADERS ${MOC_HDRS}
abstractcliparser.h
bufferinfo.h
cliparser.h
abstractcliparser.h
bufferinfo.h
cliparser.h
+ ctcpevent.h
+ event.h
+ ircevent.h
+ networkevent.h
+ messageevent.h
logger.h
message.h
types.h
logger.h
message.h
types.h
@@
-68,6
+72,13
@@
if(APPLE)
set(HEADERS ${HEADERS} mac_utils.h)
endif(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
qt4_wrap_cpp(MOC ${MOC_HDRS})
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) # for version.inc and version.gen
@@
-79,9
+90,4
@@
if(APPLE)
target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
endif(APPLE)
target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
endif(APPLE)
-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})