Initial architecture refactoring

CMakeLists.txt

@@ -20,11 +20,12 @@ include(ECMSetupVersion)
 include(ECMInstallIcons)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
+include(GenerateExportHeader)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(FeatureSummary)
 
 ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX MINUET
-                  VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/minuet_version.h"
+                  VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/app/minuet_version.h"
 )
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets Quick)
@@ -73,9 +74,16 @@ endif()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
+include_directories(${minuet_SOURCE_DIR}/src/ ${minuet_BINARY_DIR}/src)
+
 add_subdirectory(doc)
 add_subdirectory(src)
 add_subdirectory(icons)
 add_subdirectory(exercises)
 
 install(FILES org.kde.minuet.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+
+install(EXPORT MinuetTargets
+    DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Minuet"
+    NAMESPACE Minuet::
+    FILE MinuetTargets.cmake)

src/CMakeLists.txt

-kde_enable_exceptions()
-
-set(minuet_SRCS
-    main.cpp
-    song.cpp
-    wizard.cpp
-    minuet.cpp
-    midisequencer.cpp
-    midisequenceroutputthread.cpp
-    exercisecontroller.cpp
-)
-
-kconfig_add_kcfg_files(minuet_SRCS minuetsettings.kcfgc)
-ki18n_wrap_ui(minuet_SRCS
-    settingsmidi.ui
-    wizardsystemcheck.ui
-)
-
-add_executable(minuet ${minuet_SRCS})
-
-target_link_libraries(minuet
-    Qt5::Core
-    Qt5::Gui
-    Qt5::Widgets
-    Qt5::Quick
-    KF5::I18n
-    KF5::XmlGui
-    KF5::KIOWidgets
-    KF5::Crash
-    asound
-    drumstick-alsa
-    drumstick-file
-)
-
-install(TARGETS minuet ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/minuet)
-install(PROGRAMS org.kde.minuet.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install(FILES minuetui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/minuet)
+add_subdirectory(interfaces)
+add_subdirectory(shell)
+add_subdirectory(app)

src/app/CMakeLists.txt

+kde_enable_exceptions()
+
+set(minuet_SRCS
+    main.cpp
+    song.cpp
+    wizard.cpp
+    minuet.cpp
+    midisequencer.cpp
+    midisequenceroutputthread.cpp
+    exercisecontroller.cpp
+)
+
+kconfig_add_kcfg_files(minuet_SRCS minuetsettings.kcfgc)
+ki18n_wrap_ui(minuet_SRCS
+    settingsmidi.ui
+    wizardsystemcheck.ui
+)
+
+add_executable(minuet ${minuet_SRCS})
+
+target_link_libraries(minuet
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Widgets
+    Qt5::Quick
+    KF5::I18n
+    KF5::XmlGui
+    KF5::KIOWidgets
+    KF5::Crash
+    asound
+    drumstick-alsa
+    drumstick-file
+)
+
+install(TARGETS minuet ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/minuet)
+install(PROGRAMS org.kde.minuet.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(FILES minuetui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/minuet)