ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert C++ parts into a static library

Browse Source 
This allows us to start adding unit tests
This commit is contained in:
Tobias Fella
2022-07-09 14:14:53 +02:00
parent b1581a54d1
commit a37fd0713f
1 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/CMakeLists.txt
View File

@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de> # SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
# SPDX-License-Identifier: BSD-2-Clause # SPDX-License-Identifier: BSD-2-Clause
add_executable(neochat add_library(neochat STATIC
controller.cpp controller.cpp
actionshandler.cpp actionshandler.cpp
emojimodel.cpp emojimodel.cpp
@@ -21,7 +21,6 @@ add_executable(neochat
publicroomlistmodel.cpp publicroomlistmodel.cpp
userdirectorylistmodel.cpp userdirectorylistmodel.cpp
utils.cpp utils.cpp
main.cpp
notificationsmanager.cpp notificationsmanager.cpp
sortfilterroomlistmodel.cpp sortfilterroomlistmodel.cpp
chatdocumenthandler.cpp chatdocumenthandler.cpp
@@ -37,11 +36,21 @@ add_executable(neochat
joinrulesevent.cpp joinrulesevent.cpp
collapsestateproxymodel.cpp collapsestateproxymodel.cpp
urlhelper.cpp urlhelper.cpp
)
add_executable(neochat-app
main.cpp
../res.qrc ../res.qrc
) )
target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
target_link_libraries(neochat-app PRIVATE
neochat
)
if(Quotient_VERSION_MINOR GREATER 6) if(Quotient_VERSION_MINOR GREATER 6)
target_compile_definitions(neochat PRIVATE QUOTIENT_07) target_compile_definitions(neochat PUBLIC QUOTIENT_07)
else() else()
target_sources(neochat PRIVATE neochataccountregistry.cpp) target_sources(neochat PRIVATE neochataccountregistry.cpp)
endif() endif()
@@ -57,34 +66,37 @@ if(NOT ANDROID)
else() else()
target_sources(neochat PRIVATE trayicon.cpp) target_sources(neochat PRIVATE trayicon.cpp)
endif() endif()
target_link_libraries(neochat PRIVATE KF5::ConfigWidgets KF5::WindowSystem) target_link_libraries(neochat PUBLIC KF5::ConfigWidgets KF5::WindowSystem)
target_compile_definitions(neochat PRIVATE -DHAVE_COLORSCHEME) target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
target_compile_definitions(neochat PRIVATE -DHAVE_WINDOWSYSTEM) target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
endif() endif()
if (NOT ANDROID AND NOT WIN32 AND NOT APPLE) if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
target_sources(neochat PRIVATE ../res_desktop.qrc runner.cpp) target_sources(neochat-app PRIVATE ../res_desktop.qrc)
target_compile_definitions(neochat PRIVATE -DHAVE_RUNNER) target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
target_sources(neochat PRIVATE runner.cpp)
else() else()
target_sources(neochat PRIVATE ../res_android.qrc) target_sources(neochat-app PRIVATE ../res_android.qrc)
endif() endif()
target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR}) target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
target_link_libraries(neochat PRIVATE Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES}) target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES})
if(TARGET QCoro${QT_MAJOR_VERSION}::Coro) if(TARGET QCoro5::Coro)
target_link_libraries(neochat PRIVATE QCoro${QT_MAJOR_VERSION}::Coro) target_link_libraries(neochat PUBLIC QCoro5::Coro)
else() else()
target_link_libraries(neochat PRIVATE QCoro::QCoro) target_link_libraries(neochat PUBLIC QCoro::QCoro)
endif() endif()
kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc) kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
if(NEOCHAT_FLATPAK) if(NEOCHAT_FLATPAK)
target_compile_definitions(neochat PRIVATE NEOCHAT_FLATPAK) target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)
endif() endif()
if(ANDROID) if(ANDROID)
target_sources(neochat PRIVATE notifyrc.qrc) target_sources(neochat PRIVATE notifyrc.qrc)
target_link_libraries(neochat PRIVATE Qt::Svg OpenSSL::SSL) target_link_libraries(neochat PRIVATE Qt::Svg OpenSSL::SSL)
target_sources(neochat-app PRIVATE notifyrc.qrc)
target_link_libraries(neochat PUBLIC Qt::Svg OpenSSL::SSL)
kirigami_package_breeze_icons(ICONS kirigami_package_breeze_icons(ICONS
"arrow-down" "arrow-down"
"help-about" "help-about"
@@ -126,20 +138,22 @@ if(ANDROID)
"preferences-desktop-theme-global" "preferences-desktop-theme-global"
) )
else() else()
target_link_libraries(neochat PRIVATE Qt::Widgets KF5::KIOWidgets) target_link_libraries(neochat PUBLIC Qt::Widgets KF5::KIOWidgets)
install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}) install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
endif() endif()
set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
if(TARGET KF5::DBusAddons) if(TARGET KF5::DBusAddons)
target_link_libraries(neochat PRIVATE KF5::DBusAddons) target_link_libraries(neochat PUBLIC KF5::DBusAddons)
target_compile_definitions(neochat PRIVATE -DHAVE_KDBUSADDONS) target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
endif() endif()
if (TARGET KF5::KIOWidgets) if (TARGET KF5::KIOWidgets)
target_compile_definitions(neochat PRIVATE -DHAVE_KIO) target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
endif() endif()
install(TARGETS neochat ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS neochat-app ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
if (NOT ANDROID AND NOT WIN32 AND NOT APPLE) if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins) install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)