Merge pull request 'Refactor CMakeLists' (#46) from vae/squawk:build-refactor into messageFeed

Reviewed-on: blue/squawk#46

CMakeLists.txt

@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.4)
-project(squawk)
+project(squawk VERSION 0.1.6 LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+cmake_policy(SET CMP0076 NEW)
+cmake_policy(SET CMP0079 NEW)
 set(CMAKE_CXX_STANDARD 17)
 
 set(CMAKE_AUTOMOC ON)
@@ -9,65 +10,20 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 include(GNUInstallDirs)
-include_directories(.)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
-find_package(Qt5Widgets CONFIG REQUIRED)
+add_executable(squawk)
-find_package(Qt5LinguistTools)
+target_include_directories(squawk PRIVATE ${CMAKE_SOURCE_DIR})
-
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Debug)
-endif()
-
-set(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -Wextra")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3")
-message("Build type: ${CMAKE_BUILD_TYPE}")
-
-
-set(squawk_SRC
-  main.cpp
-  exception.cpp
-  signalcatcher.cpp
-  shared/global.cpp
-  shared/utils.cpp
-  shared/message.cpp
-  shared/vcard.cpp
-  shared/icons.cpp
-  shared/messageinfo.cpp
-)
-
-set(squawk_HEAD
-  exception.h
-  signalcatcher.h
-  shared.h
-  shared/enums.h
-  shared/message.h
-  shared/global.h
-  shared/utils.h
-  shared/vcard.h
-  shared/icons.h
-  shared/messageinfo.h
-)
-
-configure_file(resources/images/logo.svg squawk.svg COPYONLY)
-execute_process(COMMAND convert -background none -size 48x48 squawk.svg squawk48.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-execute_process(COMMAND convert -background none -size 64x64 squawk.svg squawk64.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-execute_process(COMMAND convert -background none -size 128x128 squawk.svg squawk128.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-execute_process(COMMAND convert -background none -size 256x256 squawk.svg squawk256.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-configure_file(packaging/squawk.desktop squawk.desktop COPYONLY)
-
-set(TS_FILES 
-    translations/squawk.ru.ts
-)
-qt5_add_translation(QM_FILES ${TS_FILES})
-add_custom_target(translations ALL DEPENDS ${QM_FILES})
-
-qt5_add_resources(RCC resources/resources.qrc)
 
 option(SYSTEM_QXMPP "Use system qxmpp lib" ON)
 option(WITH_KWALLET "Build KWallet support module" ON)
 option(WITH_KIO "Build KIO support module" ON)
 
+# Dependencies
+## Qt
+find_package(Qt5 COMPONENTS Widgets DBus Gui Xml Network Core REQUIRED)
+
+## QXmpp
 if (SYSTEM_QXMPP)
   find_package(QXmpp CONFIG)
 
@@ -80,24 +36,13 @@ if (SYSTEM_QXMPP)
 endif ()
 
 if (NOT SYSTEM_QXMPP)
+  target_link_libraries(squawk PRIVATE qxmpp)
   add_subdirectory(external/qxmpp)
-endif()
-
-if (WITH_KWALLET)
-    find_package(KF5Wallet CONFIG)
-    
-    if (NOT KF5Wallet_FOUND)
-        set(WITH_KWALLET OFF)
-        message("KWallet package wasn't found, KWallet support module wouldn't be built")
 else ()
-        add_definitions(-DWITH_KWALLET)
+  target_link_libraries(squawk PRIVATE QXmpp::QXmpp)
-        message("Building with support of KWallet")
-    endif()
 endif ()
 
-add_executable(squawk ${squawk_SRC} ${squawk_HEAD} ${RCC})
+## KIO
-target_link_libraries(squawk Qt5::Widgets)
-
 if (WITH_KIO)
   find_package(KF5KIO CONFIG)
 
@@ -105,31 +50,57 @@ if (WITH_KIO)
     set(WITH_KIO OFF)
     message("KIO package wasn't found, KIO support modules wouldn't be built")
   else ()
-        add_definitions(-DWITH_KIO)
+    target_compile_definitions(squawk PRIVATE WITH_KIO)
     message("Building with support of KIO")
   endif ()
 endif ()
 
-add_subdirectory(ui)
+## KWallet
+if (WITH_KWALLET)
+  find_package(KF5Wallet CONFIG)
+
+  if (NOT KF5Wallet_FOUND)
+    set(WITH_KWALLET OFF)
+    message("KWallet package wasn't found, KWallet support module wouldn't be built")
+  else ()
+    target_compile_definitions(squawk PRIVATE WITH_KWALLET)
+    message("Building with support of KWallet")
+  endif ()
+endif ()
+
+## Signal (TODO)
+# find_package(Signal REQUIRED)
+
+## LMDB
+find_package(LMDB REQUIRED)
+
+# Linking
+target_link_libraries(squawk PRIVATE Qt5::Core Qt5::Widgets Qt5::DBus Qt5::Network Qt5::Gui Qt5::Xml)
+target_link_libraries(squawk PRIVATE lmdb)
+target_link_libraries(squawk PRIVATE simpleCrypt)
+target_link_libraries(squawk PRIVATE uuid)
+
+# Build type
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Debug)
+endif ()
+
+message("Build type: ${CMAKE_BUILD_TYPE}")
+
+target_compile_options(squawk PRIVATE
+  "-Wall;-Wextra"
+  "$<$<CONFIG:DEBUG>:-g>"
+  "$<$<CONFIG:RELEASE>:-O3>"
+  )
+
 add_subdirectory(core)
-add_subdirectory(plugins)
-
 add_subdirectory(external/simpleCrypt)
-
+add_subdirectory(packaging)
-target_link_libraries(squawk squawkUI)
+add_subdirectory(plugins)
-target_link_libraries(squawk squawkCORE)
+add_subdirectory(resources)
-target_link_libraries(squawk uuid)
+add_subdirectory(shared)
-
+add_subdirectory(translations)
-
+add_subdirectory(ui)
-
-add_dependencies(${CMAKE_PROJECT_NAME} translations)
 
 # Install the executable
 install(TARGETS squawk DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/squawk/l10n)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk48.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps RENAME squawk.png)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk64.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps RENAME squawk.png)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk128.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps RENAME squawk.png)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk256.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/apps RENAME squawk.png)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)

cmake/FindSignal.cmake

@@ -0,0 +1,15 @@
+find_path(Signal_INCLUDE_DIR NAMES signal/signal_protocol.h)
+find_library(Signal_LIBRARY signal-protocol-c)
+mark_as_advanced(Signal_INCLUDE_DIR Signal_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Signal REQUIRED_VARS Signal_LIBRARY Signal_INCLUDE_DIR)
+
+if (Signal_FOUND AND NOT TARGET Signal::Signal)
+  add_library(Signal::Signal UNKNOWN IMPORTED)
+  set_target_properties(Signal::Signal PROPERTIES
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+    IMPORTED_LOCATION "${Signal_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${Signal_INCLUDE_DIR}"
+    )
+endif ()

core/CMakeLists.txt

@@ -1,49 +1,27 @@
-cmake_minimum_required(VERSION 3.3)
+target_sources(squawk PRIVATE
-project(squawkCORE)
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-
-set(CMAKE_AUTOMOC ON)
-
-find_package(Qt5Core CONFIG REQUIRED)
-find_package(Qt5Gui CONFIG REQUIRED)
-find_package(Qt5Network CONFIG REQUIRED)
-find_package(Qt5Xml CONFIG REQUIRED)
-find_package(LMDB REQUIRED)
-
-set(squawkCORE_SRC
-    squawk.cpp
   account.cpp
-    archive.cpp
+  account.h
-    rosteritem.cpp
-    contact.cpp
-    conference.cpp
-    urlstorage.cpp
-    networkaccess.cpp
   adapterFuctions.cpp
-    handlers/messagehandler.cpp
+  archive.cpp
-    handlers/rosterhandler.cpp
+  archive.h
+  conference.cpp
+  conference.h
+  contact.cpp
+  contact.h
+  main.cpp
+  networkaccess.cpp
+  networkaccess.h
+  rosteritem.cpp
+  rosteritem.h
+  signalcatcher.cpp
+  signalcatcher.h
+  squawk.cpp
+  squawk.h
+  storage.cpp
+  storage.h
+  urlstorage.cpp
+  urlstorage.h
   )
 
+add_subdirectory(handlers)
 add_subdirectory(passwordStorageEngines)
-
-# Tell CMake to create the helloworld executable
-add_library(squawkCORE STATIC ${squawkCORE_SRC})
-
-
-if(SYSTEM_QXMPP)
-    get_target_property(QXMPP_INTERFACE_INCLUDE_DIRECTORIES QXmpp::QXmpp INTERFACE_INCLUDE_DIRECTORIES)
-    target_include_directories(squawkCORE PUBLIC ${QXMPP_INTERFACE_INCLUDE_DIRECTORIES})
-endif()
-
-# Use the Widgets module from Qt 5.
-target_link_libraries(squawkCORE Qt5::Core)
-target_link_libraries(squawkCORE Qt5::Network)
-target_link_libraries(squawkCORE Qt5::Gui)
-target_link_libraries(squawkCORE Qt5::Xml)
-target_link_libraries(squawkCORE qxmpp)
-target_link_libraries(squawkCORE lmdb)
-target_link_libraries(squawkCORE simpleCrypt)
-if (WITH_KWALLET)
-    target_link_libraries(squawkCORE kwalletPSE)
-endif()

core/account.h

@@ -43,7 +43,7 @@
 #include <QXmppVCardManager.h>
 #include <QXmppMessageReceiptManager.h>
 
-#include "shared.h"
+#include "shared/shared.h"
 #include "contact.h"
 #include "conference.h"
 #include "networkaccess.h"

core/archive.h

@@ -25,7 +25,7 @@
 #include <QMimeType>
 
 #include "shared/message.h"
-#include "exception.h"
+#include "shared/exception.h"
 #include <lmdb.h>
 #include <list>
 

core/handlers/CMakeLists.txt

@@ -0,0 +1,6 @@
+target_sources(squawk PRIVATE
+  messagehandler.cpp
+  messagehandler.h
+  rosterhandler.cpp
+  rosterhandler.h
+  )

core/main.cpp

@@ -16,18 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ui/squawk.h"
+#include "../shared/global.h"
-#include "core/squawk.h"
+#include "../shared/messageinfo.h"
+#include "../ui/squawk.h"
 #include "signalcatcher.h"
-#include "shared/global.h"
+#include "squawk.h"
-#include "shared/messageinfo.h"
-#include <QtWidgets/QApplication>
-#include <QtCore/QThread>
-#include <QtCore/QObject>
-#include <QSettings>
-#include <QTranslator>
 #include <QLibraryInfo>
+#include <QSettings>
 #include <QStandardPaths>
+#include <QTranslator>
+#include <QtCore/QObject>
+#include <QtCore/QThread>
+#include <QtWidgets/QApplication>
 
 int main(int argc, char *argv[])
 {

core/passwordStorageEngines/CMakeLists.txt

@@ -1,37 +1,9 @@
-cmake_minimum_required(VERSION 3.3)
-project(pse)
-
 if (WITH_KWALLET)
-    set(CMAKE_AUTOMOC ON)
+  target_sources(squawk PRIVATE
-
-    find_package(Qt5Core CONFIG REQUIRED)
-    find_package(Qt5Gui CONFIG REQUIRED)
-
-    get_target_property(KWALLET_INTERFACE_INCLUDE_DIRECTORIES KF5::Wallet INTERFACE_INCLUDE_DIRECTORIES)
-    get_target_property(Qt5GUI_INTERFACE_INCLUDE_DIRECTORIES Qt5::Gui INTERFACE_INCLUDE_DIRECTORIES)
-
-    set(kwalletPSE_SRC
     kwallet.cpp
+    kwallet.h
     )
 
-    add_library(kwalletPSE STATIC ${kwalletPSE_SRC})
+  add_subdirectory(wrappers)
-    
+  target_include_directories(squawk PRIVATE $<TARGET_PROPERTY:KF5::Wallet,INTERFACE_INCLUDE_DIRECTORIES>)
-    target_include_directories(kwalletPSE PUBLIC ${KWALLET_INTERFACE_INCLUDE_DIRECTORIES})
-    target_include_directories(kwalletPSE PUBLIC ${Qt5GUI_INTERFACE_INCLUDE_DIRECTORIES})
-
-    target_link_libraries(kwalletPSE Qt5::Core)
-
-    set(kwalletW_SRC
-        wrappers/kwallet.cpp
-    )
-
-    add_library(kwalletWrapper SHARED ${kwalletW_SRC})
-
-    target_include_directories(kwalletWrapper PUBLIC ${KWALLET_INTERFACE_INCLUDE_DIRECTORIES})
-    target_include_directories(kwalletWrapper PUBLIC ${Qt5GUI_INTERFACE_INCLUDE_DIRECTORIES})
-
-    target_link_libraries(kwalletWrapper KF5::Wallet)
-    target_link_libraries(kwalletWrapper Qt5::Core)
-
-    install(TARGETS kwalletWrapper DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif ()

core/passwordStorageEngines/wrappers/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_library(kwalletWrapper SHARED kwallet.cpp)
+target_link_libraries(kwalletWrapper PRIVATE KF5::Wallet)

external/simpleCrypt/CMakeLists.txt

@@ -1,16 +1,10 @@
 cmake_minimum_required(VERSION 3.0)
-project(simplecrypt)
+project(simplecrypt LANGUAGES CXX)
 
 set(CMAKE_AUTOMOC ON)
 
-find_package(Qt5Core CONFIG REQUIRED)
+find_package(Qt5 COMPONENTS Core REQUIRED)
 
-set(simplecrypt_SRC
+add_library(simpleCrypt STATIC simplecrypt.cpp simplecrypt.h)
-    simplecrypt.cpp
-)
 
-# Tell CMake to create the helloworld executable
-add_library(simpleCrypt STATIC ${simplecrypt_SRC})
-
-# Use the Widgets module from Qt 5.
 target_link_libraries(simpleCrypt Qt5::Core)

packaging/CMakeLists.txt

@@ -0,0 +1,3 @@
+configure_file(squawk.desktop squawk.desktop COPYONLY)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)

plugins/CMakeLists.txt

@@ -1,26 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
-project(plugins)
-
 if (WITH_KIO)
-    set(CMAKE_AUTOMOC ON)
+  add_library(openFileManagerWindowJob SHARED openfilemanagerwindowjob.cpp)
-    
+  target_link_libraries(openFileManagerWindowJob PRIVATE KF5::KIOWidgets)
-    find_package(Qt5Core CONFIG REQUIRED)
-
-    set(openFileManagerWindowJob_SRC
-        openfilemanagerwindowjob.cpp
-    )
-
-    add_library(openFileManagerWindowJob SHARED ${openFileManagerWindowJob_SRC})
-    
-    get_target_property(Qt5CORE_INTERFACE_INCLUDE_DIRECTORIES Qt5::Core INTERFACE_INCLUDE_DIRECTORIES)
-    get_target_property(KIO_WIDGETS_INTERFACE_INCLUDE_DIRECTORIES KF5::KIOWidgets INTERFACE_INCLUDE_DIRECTORIES)
-    get_target_property(CORE_ADDONS_INTERFACE_INCLUDE_DIRECTORIES KF5::CoreAddons INTERFACE_INCLUDE_DIRECTORIES)
-    target_include_directories(openFileManagerWindowJob PUBLIC ${KIO_WIDGETS_INTERFACE_INCLUDE_DIRECTORIES})
-    target_include_directories(openFileManagerWindowJob PUBLIC ${CORE_ADDONS_INTERFACE_INCLUDE_DIRECTORIES})
-    target_include_directories(openFileManagerWindowJob PUBLIC ${Qt5CORE_INTERFACE_INCLUDE_DIRECTORIES})
-    
-    target_link_libraries(openFileManagerWindowJob KF5::KIOWidgets)
-    target_link_libraries(openFileManagerWindowJob Qt5::Core)
-
-    install(TARGETS openFileManagerWindowJob DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif ()

resources/CMakeLists.txt

@@ -0,0 +1,14 @@
+target_sources(squawk PRIVATE resources.qrc)
+
+configure_file(images/logo.svg squawk.svg COPYONLY)
+
+execute_process(COMMAND convert -background none -size 48x48 squawk.svg squawk48.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+execute_process(COMMAND convert -background none -size 64x64 squawk.svg squawk64.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+execute_process(COMMAND convert -background none -size 128x128 squawk.svg squawk128.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+execute_process(COMMAND convert -background none -size 256x256 squawk.svg squawk256.png WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk48.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps RENAME squawk.png)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk64.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps RENAME squawk.png)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk128.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps RENAME squawk.png)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/squawk256.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/apps RENAME squawk.png)

shared/CMakeLists.txt

@@ -0,0 +1,19 @@
+target_sources(squawk PRIVATE
+  enums.h
+  global.cpp
+  global.h
+  exception.cpp
+  exception.h
+  icons.cpp
+  icons.h
+  message.cpp
+  message.h
+  messageinfo.cpp
+  messageinfo.h
+  order.h
+  shared.h
+  utils.cpp
+  utils.h
+  vcard.cpp
+  vcard.h
+  )

shared/shared.h

@@ -19,12 +19,12 @@
 #ifndef SHARED_H
 #define SHARED_H
 
-#include "shared/enums.h"
+#include "enums.h"
-#include "shared/utils.h"
+#include "global.h"
-#include "shared/icons.h"
+#include "icons.h"
-#include "shared/message.h"
+#include "message.h"
-#include "shared/vcard.h"
+#include "messageinfo.h"
-#include "shared/global.h"
+#include "utils.h"
-#include "shared/messageinfo.h"
+#include "vcard.h"
 
 #endif // SHARED_H

translations/CMakeLists.txt

@@ -0,0 +1,8 @@
+find_package(Qt5LinguistTools)
+
+set(TS_FILES squawk.ru.ts)
+qt5_add_translation(QM_FILES ${TS_FILES})
+add_custom_target(translations ALL DEPENDS ${QM_FILES})
+install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/squawk/l10n)
+
+add_dependencies(${CMAKE_PROJECT_NAME} translations)

ui/CMakeLists.txt

@@ -1,43 +1,5 @@
-cmake_minimum_required(VERSION 3.3)
+target_sources(squawk PRIVATE squawk.cpp squawk.h squawk.ui)
-project(squawkUI)
-
-# Instruct CMake to run moc automatically when needed.
-set(CMAKE_AUTOMOC ON)
-# Instruct CMake to create code from Qt designer ui files
-set(CMAKE_AUTOUIC ON)
-
-# Find the QtWidgets library
-find_package(Qt5 CONFIG REQUIRED COMPONENTS Widgets DBus Core)
-find_package(Boost 1.36.0 REQUIRED)
-if(Boost_FOUND)
-  include_directories(${Boost_INCLUDE_DIRS})
-endif()
 
+add_subdirectory(models)
 add_subdirectory(utils)
 add_subdirectory(widgets)
-
-set(squawkUI_SRC
-  squawk.cpp
-  models/accounts.cpp
-  models/roster.cpp
-  models/item.cpp
-  models/account.cpp
-  models/contact.cpp
-  models/presence.cpp
-  models/group.cpp
-  models/room.cpp
-  models/abstractparticipant.cpp
-  models/participant.cpp
-  models/reference.cpp
-  models/messagefeed.cpp
-  models/element.cpp
-)
-
-# Tell CMake to create the helloworld executable
-add_library(squawkUI STATIC ${squawkUI_SRC})
-
-# Use the Widgets module from Qt 5.
-target_link_libraries(squawkUI squawkWidgets)
-target_link_libraries(squawkUI squawkUIUtils)
-target_link_libraries(squawkUI Qt5::Widgets)
-target_link_libraries(squawkUI Qt5::DBus)

ui/models/CMakeLists.txt

@@ -0,0 +1,28 @@
+target_sources(squawk PRIVATE
+  abstractparticipant.cpp
+  abstractparticipant.h
+  account.cpp
+  account.h
+  accounts.cpp
+  accounts.h
+  contact.cpp
+  contact.h
+  element.cpp
+  element.h
+  group.cpp
+  group.h
+  item.cpp
+  item.h
+  messagefeed.cpp
+  messagefeed.h
+  participant.cpp
+  participant.h
+  presence.cpp
+  presence.h
+  reference.cpp
+  reference.h
+  room.cpp
+  room.h
+  roster.cpp
+  roster.h
+  )

ui/squawk.h

@@ -39,7 +39,7 @@
 #include "models/roster.h"
 #include "widgets/vcard/vcard.h"
 
-#include "shared.h"
+#include "shared/shared.h"
 
 namespace Ui {
 class Squawk;

ui/utils/CMakeLists.txt

@@ -1,32 +1,26 @@
-cmake_minimum_required(VERSION 3.3)
+target_sources(squawk PRIVATE
-project(squawkUIUtils)
-
-# Instruct CMake to run moc automatically when needed.
-set(CMAKE_AUTOMOC ON)
-# Instruct CMake to create code from Qt designer ui files
-set(CMAKE_AUTOUIC ON)
-
-# Find the QtWidgets library
-find_package(Qt5 CONFIG REQUIRED COMPONENTS Widgets Core)
-
-set(squawkUIUtils_SRC
-#  messageline.cpp
-#  message.cpp
-  resizer.cpp
-#  image.cpp
-  flowlayout.cpp
   badge.cpp
-  progress.cpp
+  badge.h
   comboboxdelegate.cpp
-  feedview.cpp
+  comboboxdelegate.h
-  messagedelegate.cpp
   exponentialblur.cpp
+  exponentialblur.h
+  feedview.cpp
+  feedview.h
+  flowlayout.cpp
+  flowlayout.h
+  image.cpp
+  image.h
+  message.cpp
+  message.h
+  messagedelegate.cpp
+  messagedelegate.h
+  messageline.cpp
+  messageline.h
+  progress.cpp
+  progress.h
+  resizer.cpp
+  resizer.h
   shadowoverlay.cpp
+  shadowoverlay.h
   )
-
-# Tell CMake to create the helloworld executable
-add_library(squawkUIUtils STATIC ${squawkUIUtils_SRC})
-
-# Use the Widgets module from Qt 5.
-target_link_libraries(squawkUIUtils squawkWidgets)
-target_link_libraries(squawkUIUtils Qt5::Widgets)

ui/widgets/CMakeLists.txt

@@ -1,31 +1,23 @@
-cmake_minimum_required(VERSION 3.0)
+target_sources(squawk PRIVATE
-project(squawkWidgets)
-
-# Instruct CMake to run moc automatically when needed.
-set(CMAKE_AUTOMOC ON)
-# Instruct CMake to create code from Qt designer ui files
-set(CMAKE_AUTOUIC ON)
-
-# Find the QtWidgets library
-find_package(Qt5Widgets CONFIG REQUIRED COMPONENTS Widgets Core)
-
-add_subdirectory(vcard)
-
-set(squawkWidgets_SRC
-  conversation.cpp
-  chat.cpp
-  room.cpp
-  newcontact.cpp
-  accounts.cpp
   account.cpp
+  account.h
+  account.ui
+  accounts.cpp
+  accounts.h
+  accounts.ui
+  chat.cpp
+  chat.h
+  conversation.cpp
+  conversation.h
+  conversation.ui
   joinconference.cpp
+  joinconference.h
+  joinconference.ui
+  newcontact.cpp
+  newcontact.h
+  newcontact.ui
+  room.cpp
+  room.h
   )
 
-add_library(squawkWidgets STATIC ${squawkWidgets_SRC})
+add_subdirectory(vcard)
-
-# Use the Widgets module from Qt 5.
-target_link_libraries(squawkWidgets vCardUI)
-target_link_libraries(squawkWidgets squawkUIUtils)
-target_link_libraries(squawkWidgets Qt5::Widgets)
-
-qt5_use_modules(squawkWidgets Core Widgets)

ui/widgets/conversation.h

@@ -30,7 +30,7 @@
 #include <QDesktopServices>
 
 #include "shared/message.h"
-#include "order.h"
+#include "shared/order.h"
 #include "ui/models/account.h"
 #include "ui/models/roster.h"
 #include "ui/utils/flowlayout.h"

ui/widgets/vcard/CMakeLists.txt

@@ -1,22 +1,9 @@
-cmake_minimum_required(VERSION 3.0)
+target_sources(squawk PRIVATE
-project(vCardUI)
-
-# Instruct CMake to run moc automatically when needed.
-set(CMAKE_AUTOMOC ON)
-# Instruct CMake to create code from Qt designer ui files
-set(CMAKE_AUTOUIC ON)
-
-# Find the QtWidgets library
-find_package(Qt5Widgets CONFIG REQUIRED)
-
-set(vCardUI_SRC
-  vcard.cpp
   emailsmodel.cpp
+  emailsmodel.h
   phonesmodel.cpp
+  phonesmodel.h
+  vcard.cpp
+  vcard.h
+  vcard.ui
   )
-
-# Tell CMake to create the helloworld executable
-add_library(vCardUI STATIC ${vCardUI_SRC})
-
-# Use the Widgets module from Qt 5.
-target_link_libraries(vCardUI Qt5::Widgets)