projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement /ignore functionality
[quassel.git]
/
src
/
common
/
CMakeLists.txt
diff --git
a/src/common/CMakeLists.txt
b/src/common/CMakeLists.txt
index
101498c
..
1deac52
100644
(file)
--- a/
src/common/CMakeLists.txt
+++ b/
src/common/CMakeLists.txt
@@
-9,11
+9,12
@@
set(SOURCES
buffersyncer.cpp
bufferviewconfig.cpp
bufferviewmanager.cpp
buffersyncer.cpp
bufferviewconfig.cpp
bufferviewmanager.cpp
- cliparser.cpp
compressor.cpp
ctcpevent.cpp
compressor.cpp
ctcpevent.cpp
+ dccconfig.cpp
event.cpp
eventmanager.cpp
event.cpp
eventmanager.cpp
+ highlightrulemanager.cpp
identity.cpp
ignorelistmanager.cpp
internalpeer.cpp
identity.cpp
ignorelistmanager.cpp
internalpeer.cpp
@@
-44,10
+45,17
@@
set(SOURCES
# needed for automoc
coreinfo.h
# needed for automoc
coreinfo.h
+ irccap.h
+ protocol.h
)
)
+if (USE_QT5)
+ list(APPEND SOURCES qt5cliparser.cpp)
+else()
+ list(APPEND SOURCES cliparser.cpp)
+endif()
-if (QCA2_FOUND)
+if (QCA2_FOUND
OR QCA2-QT5_FOUND
)
set(SOURCES ${SOURCES} keyevent.cpp)
endif()
set(SOURCES ${SOURCES} keyevent.cpp)
endif()
@@
-58,13
+66,17
@@
else()
set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c)
endif()
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()
if (HAVE_SYSLOG)
add_definitions(-DHAVE_SYSLOG)
endif()
-if(APPLE)
- set(SOURCES ${SOURCES} mac_utils.cpp)
-endif(
APPLE
)
+if
(APPLE)
+
set(SOURCES ${SOURCES} mac_utils.cpp)
+endif()
if (WIN32)
set(SOURCES ${SOURCES} logbacktrace_win.cpp)
if (WIN32)
set(SOURCES ${SOURCES} logbacktrace_win.cpp)
@@
-76,11
+88,21
@@
else()
set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
endif()
set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
endif()
+qt_add_resources(SOURCES ${COMMON_RCS})
+
add_library(mod_common STATIC ${SOURCES})
qt_use_modules(mod_common Core Network)
add_library(mod_common STATIC ${SOURCES})
qt_use_modules(mod_common Core Network)
-if(APPLE)
- target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
-endif(APPLE)
+if (APPLE)
+ target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
+endif()
+
+target_link_libraries(mod_common ${CMAKE_DL_LIBS} ${EXECINFO_LIBRARIES})
+
+if(ZLIB_FOUND)
+ target_link_libraries(mod_common ${ZLIB_LIBRARIES})
+endif()
-target_link_libraries(mod_common ${CMAKE_DL_LIBS} ${EXECINFO_LIBRARIES} ${ZLIB_LIBRARIES})
+# This is needed so translations are generated before trying to build the qrc.
+# Should probably find a nicer solution with proper dependencies between the involved files, though...
+add_dependencies(mod_common po)