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)