cmake: Reorder slightly for consistency
authorManuel Nickschas <sputnick@quassel-irc.org>
Wed, 29 Aug 2018 16:17:26 +0000 (18:17 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Sun, 18 Nov 2018 10:06:43 +0000 (11:06 +0100)
Other modules link the main dependencies before caring about
options, so do the same for the core module.

src/core/CMakeLists.txt

index 5316d58..57e5437 100644 (file)
@@ -44,14 +44,23 @@ target_sources(${TARGET} PRIVATE
     coreeventmanager.h
 )
 
     coreeventmanager.h
 )
 
-if (HAVE_SSL)
-    target_sources(${TARGET} PRIVATE sslserver.cpp)
-endif()
+target_link_libraries(${TARGET}
+    PUBLIC
+        Qt5::Core
+        Qt5::Network
+        Qt5::Script
+        Qt5::Sql
+        Quassel::Common
+)
 
 if (HAVE_UMASK)
     set_property(SOURCE oidentdconfiggenerator.cpp APPEND PROPERTY COMPILE_DEFINITIONS HAVE_UMASK)
 endif()
 
 
 if (HAVE_UMASK)
     set_property(SOURCE oidentdconfiggenerator.cpp APPEND PROPERTY COMPILE_DEFINITIONS HAVE_UMASK)
 endif()
 
+if (HAVE_SSL)
+    target_sources(${TARGET} PRIVATE sslserver.cpp)
+endif()
+
 if (Ldap_FOUND)
     target_sources(${TARGET} PRIVATE ldapauthenticator.cpp)
     target_link_libraries(${TARGET} PRIVATE Ldap::Ldap)
 if (Ldap_FOUND)
     target_sources(${TARGET} PRIVATE ldapauthenticator.cpp)
     target_link_libraries(${TARGET} PRIVATE Ldap::Ldap)
@@ -64,14 +73,5 @@ if (Qca-qt5_FOUND)
     target_compile_definitions(${TARGET} PUBLIC -DHAVE_QCA2)
 endif()
 
     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)
 quassel_add_resource(Sql PATTERNS SQL/*.sql)
 target_link_libraries(${TARGET} PUBLIC Quassel::Resource::Sql)