Moved Merge subsystem into its own subdirectory.

CMakeLists.txt

@@ -1,8 +1,14 @@
 cmake_minimum_required (VERSION 2.8)
 
+###############################################################################
+# Top-Level gLabels project
+###############################################################################
 project (glabels_qt)
 
 
+#=======================================
+# Package and Version Information
+#=======================================
 set (Package_Name "glabels-qt")
 set (Short_Name   "glabels-qt")
 set (Package_URL  "https://github.com/jimevins/glabels-qt")
@@ -15,6 +21,10 @@ set (Package_Version "${Major_Version}.${Minor_Version}.${Bugfix_Version}")
 
 set (Unique_Package_Name ${Package_Name}-${API_Version})
 
+
+#=======================================
+# Dependencies
+#=======================================
 if (WIN32)
 	# Make sure we can find MINGW libraries, e.g. zlib
 	set (CMAKE_PREFIX_PATH C:/MinGW )
@@ -23,13 +33,18 @@ endif ()
 find_package(Qt4 4.8.4 REQUIRED QtCore QtGui QtXml)
 find_package(ZLIB REQUIRED)
 
+include (${QT_USE_FILE})
 
+
+#=======================================
+# Compilation
+#=======================================
 add_definitions (-std=c++11 -g)
 
 
-#
+#=======================================
 # Subdirectories
-#
+#=======================================
 add_subdirectory (glabels)
 add_subdirectory (libglabels)
 

glabels/CMakeLists.txt

@@ -1,7 +1,14 @@
 cmake_minimum_required (VERSION 2.8)
 
+###############################################################################
+# gLabels application subproject
+###############################################################################
 project (app CXX)
 
+
+#=======================================
+# Sources
+#=======================================
 set (glabels_sources
   glabels_main.cpp
   AboutDialog.cpp
@@ -32,13 +39,7 @@ set (glabels_sources
   LabelModelShapeObject.cpp
   LabelRegion.cpp
   MainWindow.cpp
-  Merge.cpp
-  MergeFactory.cpp
   MergeView.cpp
-  MergeRecord.cpp
-  MergeNone.cpp
-  MergeText.cpp
-  MergeTextCsv.cpp
   ObjectEditor.cpp
   Outline.cpp
   PageRenderer.cpp
@@ -79,7 +80,6 @@ set (glabels_qobject_headers
   LabelModelBoxObject.h
   LabelModelShapeObject.h
   MainWindow.h
-  Merge.h
   MergeView.h
   ObjectEditor.h
   PreferencesDialog.h
@@ -115,9 +115,24 @@ qt4_wrap_cpp (glabels_moc_sources ${glabels_qobject_headers})
 qt4_wrap_ui (glabels_forms_headers ${glabels_forms})
 qt4_add_resources (glabels_qrc_sources ${glabels_resource_files})
 
-include (${QT_USE_FILE})
+add_executable (glabels-qt
+  ${glabels_sources}
+  ${glabels_moc_sources}
+  ${glabels_qrc_sources}
+  ${glabels_forms_headers}
+)
+
+target_link_libraries (glabels-qt
+  Merge
+  libglabels
+  ${QT_LIBRARIES}
+  ${ZLIB_LIBRARIES}
+)
 
 
+#=======================================
+# Where to find stuff
+#=======================================
 include_directories (
   ${ZLIB_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -129,13 +144,14 @@ link_directories (
   ${glabels_qt_SOURCE_DIR}/libglabels
 )
 
-add_executable (glabels-qt ${glabels_sources} ${glabels_moc_sources} ${glabels_qrc_sources} ${glabels_forms_headers})
 
-target_link_libraries (glabels-qt
+#=======================================
-  libglabels
+# Subdirectories
-  ${QT_LIBRARIES}
+#=======================================
-  ${ZLIB_LIBRARIES}
+add_subdirectory (Merge)
-)
 
 
+#=======================================
+# Install
+#=======================================
 install (TARGETS glabels-qt RUNTIME DESTINATION bin)

glabels/ColorNode.cpp

@@ -20,7 +20,7 @@
 
 #include "ColorNode.h"
 
-#include "MergeRecord.h"
+#include "Merge/MergeRecord.h"
 
 
 ///

glabels/LabelModel.cpp

@@ -28,7 +28,9 @@
 #include <QMimeData>
 #include <QtDebug>
 
-#include "MergeNone.h"
+#include "Merge/Merge.h"
+#include "Merge/MergeNone.h"
+#include "Merge/MergeRecord.h"
 #include "LabelModelObject.h"
 #include "LabelRegion.h"
 #include "XmlLabelCreator.h"

glabels/LabelModel.h

@@ -25,8 +25,6 @@
 #include <QList>
 #include <QPainter>
 
-#include "Merge.h"
-#include "MergeRecord.h"
 #include "libglabels/Template.h"
 #include "Settings.h"
 
@@ -35,6 +33,8 @@
 class LabelModelObject;
 class Handle;
 class LabelRegion;
+class Merge;
+class MergeRecord;
 class ColorNode;
 
 

glabels/LabelModelObject.cpp

@@ -29,7 +29,7 @@
 #include "TextNode.h"
 #include "BarcodeStyle.h"
 #include "LabelRegion.h"
-#include "MergeRecord.h"
+#include "Merge/MergeRecord.h"
 
 
 ///

glabels/Merge/CMakeLists.txt

@@ -0,0 +1,60 @@
+cmake_minimum_required (VERSION 2.8)
+
+###############################################################################
+# gLabels Merge subsystem
+###############################################################################
+project (Merge CXX)
+
+
+#=======================================
+# Sources
+#=======================================
+set (merge_sources
+  Merge.cpp
+  MergeFactory.cpp
+  MergeRecord.cpp
+  MergeNone.cpp
+  MergeText.cpp
+  MergeTextCsv.cpp
+)
+
+set (merge_qobject_headers
+  Merge.h
+)
+
+set (merge_forms
+)
+
+set (merge_resource_files
+)
+
+qt4_wrap_cpp (merge_moc_sources ${merge_qobject_headers})
+qt4_wrap_ui (merge_forms_headers ${merge_forms})
+qt4_add_resources (merge_qrc_sources ${merge_resource_files})
+
+add_library (Merge STATIC
+  ${merge_sources}
+  ${merge_moc_sources}
+  ${merge_qrc_sources}
+  ${merge_forms_headers}
+)
+
+
+#=======================================
+# Where to find stuff
+#=======================================
+include_directories (
+)
+
+link_directories (
+)
+
+
+#=======================================
+# Subdirectories
+#=======================================
+
+
+#=======================================
+# Install
+#=======================================

glabels/MergeView.cpp

@@ -21,7 +21,7 @@
 #include "MergeView.h"
 
 #include "LabelModel.h"
-#include "MergeFactory.h"
+#include "Merge/MergeFactory.h"
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QtDebug>

glabels/ObjectEditor.cpp

@@ -26,6 +26,8 @@
 #include "LabelModelBoxObject.h"
 #include "UndoRedoModel.h"
 
+#include "Merge/Merge.h"
+
 #include "Settings.h"
 
 #include <cmath>

glabels/PageRenderer.cpp

@@ -21,9 +21,9 @@
 #include "PageRenderer.h"
 
 #include "LabelModel.h"
-#include "Merge.h"
+#include "Merge/Merge.h"
-#include "MergeNone.h"
+#include "Merge/MergeNone.h"
-#include "MergeRecord.h"
+#include "Merge/MergeRecord.h"
 
 #include <QPainter>
 #include <QtDebug>

glabels/XmlLabelCreator.cpp

@@ -27,7 +27,7 @@
 //#include "LabelObjectLine.h"
 //#include "LabelObjectImage.h"
 //#include "LabelObjectBarcode.h"
-#include "MergeNone.h"
+#include "Merge/MergeNone.h"
 #include "libglabels/XmlTemplateCreator.h"
 #include "libglabels/XmlUtil.h"
 

glabels/XmlLabelParser.cpp

@@ -27,7 +27,7 @@
 //#include "LabelObjectLine.h"
 //#include "LabelObjectImage.h"
 //#include "LabelObjectBarcode.h"
-#include "MergeFactory.h"
+#include "Merge/MergeFactory.h"
 #include "libglabels/XmlTemplateParser.h"
 #include "libglabels/XmlUtil.h"
 

glabels/glabels_main.cpp

@@ -22,8 +22,8 @@
 #include <QApplication>
 
 #include "libglabels/Db.h"
+#include "Merge/MergeFactory.h"
 #include "Settings.h"
-#include "MergeFactory.h"
 #include "MainWindow.h"
 
 

libglabels/CMakeLists.txt

@@ -1,7 +1,14 @@
 cmake_minimum_required (VERSION 2.8)
 
+###############################################################################
+# gLabels libglabels subproject
+###############################################################################
 project (libglabels CXX)
 
+
+#=======================================
+# Sources
+#=======================================
 configure_file (Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h @ONLY)
 
 set (libglabels_sources
@@ -39,9 +46,16 @@ set (libglabels_resource_files
 qt4_wrap_cpp (libglabels_moc_sources ${libglabels_qobject_headers})
 qt4_add_resources(libglabels_qrc_sources ${libglabels_resource_files})
 
-include (${QT_USE_FILE})
+add_library (libglabels
+  ${libglabels_sources}
+  ${libglabels_moc_sources}
+  ${libglabels_qrc_sources}
+)
 
 
+#=======================================
+# Where to find stuff
+#=======================================
 include_directories (
   ${CMAKE_CURRENT_BINARY_DIR}
 )
@@ -49,6 +63,8 @@ include_directories (
 link_directories (
 )
 
-add_library (libglabels ${libglabels_sources} ${libglabels_moc_sources} ${libglabels_qrc_sources})
 
+#=======================================
+# Install
+#=======================================
 install (TARGETS libglabels ARCHIVE DESTINATION lib)