Cleanup allowing for tags to be available at later points, adds TAGMSG

[quassel.git] / src / core / CMakeLists.txt

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index b7858f9..a4cc809 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,4 +1,4 @@
-quassel_add_module(Core)
+quassel_add_module(Core EXPORT)
 
 target_sources(${TARGET} PRIVATE
     abstractsqlstorage.cpp
@@ -42,24 +42,29 @@ target_sources(${TARGET} PRIVATE
 
     # needed for automoc
     coreeventmanager.h
+)
 
-    # Resources
-    sql.qrc
+target_link_libraries(${TARGET}
+    PUBLIC
+        Qt5::Core
+        Qt5::Network
+        Qt5::Script
+        Qt5::Sql
+        Quassel::Common
 )
 
-if (HAVE_SSL)
-    target_sources(${TARGET} PRIVATE sslserver.cpp)
+if (HAVE_UMASK)
+    set_property(SOURCE oidentdconfiggenerator.cpp APPEND PROPERTY COMPILE_DEFINITIONS HAVE_UMASK)
 endif()
 
-if (HAVE_UMASK)
-    set_source_files_properties(oidentdconfiggenerator.cpp PROPERTIES COMPILE_DEFINITIONS HAVE_UMASK)
+if (HAVE_SSL)
+    target_sources(${TARGET} PRIVATE sslserver.cpp)
 endif()
 
-if (LDAP_FOUND)
+if (Ldap_FOUND)
     target_sources(${TARGET} PRIVATE ldapauthenticator.cpp)
-    target_link_libraries(${TARGET} PRIVATE ${LDAP_LIBRARIES})
-    target_include_directories(${TARGET} PRIVATE ${LDAP_INCLUDE_DIR})
-    target_compile_definitions(${TARGET} PRIVATE -DHAVE_LDAP)
+    target_link_libraries(${TARGET} PRIVATE Ldap::Ldap)
+    set_property(SOURCE core.cpp APPEND PROPERTY COMPILE_DEFINITIONS HAVE_LDAP)
 endif()
 
 if (Qca-qt5_FOUND)
@@ -68,11 +73,5 @@ if (Qca-qt5_FOUND)
     target_compile_definitions(${TARGET} PUBLIC -DHAVE_QCA2)
 endif()
 
-target_link_libraries(${TARGET}
-    PUBLIC
-        Qt5::Core
-        Qt5::Network
-        Qt5::Script
-        Qt5::Sql
-        Quassel::Common
-)
+quassel_add_resource(Sql PATTERNS SQL/*.sql)
+target_link_libraries(${TARGET} PUBLIC Quassel::Resource::Sql)