X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2FCMakeLists.txt;h=5316d586d1fe06794528fd0cb9b4dcbedb42ae00;hb=d9e586707522241d628a90466e13722e342cc28a;hp=b7858f9309be18183d0d6775f585c97e6114a465;hpb=b5c64cce8e7813090809a3e4de8f88e148f84392;p=quassel.git

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index b7858f93..5316d586 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -42,9 +42,6 @@ target_sources(${TARGET} PRIVATE
 
     # needed for automoc
     coreeventmanager.h
-
-    # Resources
-    sql.qrc
 )
 
 if (HAVE_SSL)
@@ -52,14 +49,13 @@ if (HAVE_SSL)
 endif()
 
 if (HAVE_UMASK)
-    set_source_files_properties(oidentdconfiggenerator.cpp PROPERTIES COMPILE_DEFINITIONS HAVE_UMASK)
+    set_property(SOURCE oidentdconfiggenerator.cpp APPEND PROPERTY COMPILE_DEFINITIONS HAVE_UMASK)
 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)
@@ -76,3 +72,6 @@ target_link_libraries(${TARGET}
         Qt5::Sql
         Quassel::Common
 )
+
+quassel_add_resource(Sql PATTERNS SQL/*.sql)
+target_link_libraries(${TARGET} PUBLIC Quassel::Resource::Sql)