X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2FCMakeLists.txt;h=417e5ff3fa2dc5374737adb996b6e8a7c3cfdef3;hp=ebc626f37be35b8d29512afa2145cd8b1a6bccc5;hb=53e50ab66a5b3fa00282545ebc22ce3433ecf42b;hpb=4ce53949ab7d52a49ae79b8817bd3aa50fada0d1 diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index ebc626f3..417e5ff3 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,4 +1,4 @@ -quassel_add_module(Common) +quassel_add_module(Common EXPORT) target_sources(${TARGET} PRIVATE abstractsignalwatcher.h @@ -17,7 +17,7 @@ target_sources(${TARGET} PRIVATE event.cpp eventmanager.cpp expressionmatch.cpp - # expressionmatchtests.cpp + funchelpers.h highlightrulemanager.cpp identity.cpp ignorelistmanager.cpp @@ -25,9 +25,11 @@ target_sources(${TARGET} PRIVATE ircchannel.cpp ircevent.cpp irclisthelper.cpp + ircdecoder.cpp + ircencoder.cpp + irctag.cpp ircuser.cpp logger.cpp - logmessage.cpp message.cpp messageevent.cpp network.cpp @@ -56,8 +58,6 @@ target_sources(${TARGET} PRIVATE # needed for automoc irccap.h protocol.h - - ${COMMON_RCS} ) # Needed for finding the generated version.h @@ -65,11 +65,16 @@ target_include_directories(${TARGET} PRIVATE ${CMAKE_BINARY_DIR}) target_link_libraries(${TARGET} PUBLIC ${CMAKE_DL_LIBS} + Boost::boost Qt5::Core Qt5::Network ZLIB::ZLIB ) +if (EMBED_DATA) + set_property(SOURCE quassel.cpp APPEND PROPERTY COMPILE_DEFINITIONS EMBED_DATA) +endif() + if (HAVE_SYSLOG) target_compile_definitions(${TARGET} PRIVATE -DHAVE_SYSLOG) endif() @@ -91,6 +96,4 @@ if (APPLE) target_link_libraries(${TARGET} PUBLIC "-framework CoreServices" "-framework CoreFoundation") endif() -# 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(${TARGET} po) +target_link_if_exists(${TARGET} PUBLIC Quassel::Resource::I18n)