From 6acb434eb00e38f345d9d201151d295f27e786c9 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 29 Aug 2018 18:17:26 +0200 Subject: [PATCH] cmake: Reorder slightly for consistency Other modules link the main dependencies before caring about options, so do the same for the core module. --- src/core/CMakeLists.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 5316d586..57e54374 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -44,14 +44,23 @@ target_sources(${TARGET} PRIVATE 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_SSL) + target_sources(${TARGET} PRIVATE sslserver.cpp) +endif() + 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_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) -- 2.20.1