Include docs and resources in macOS packaging; install docs/* and doc… (#721)

* Include docs and resources in macOS packaging; install docs/* and docs subdirs

* Fixing

Author: rmpowell77

CMakeLists.txt

@@ -57,6 +57,8 @@ set(CPACK_PACKAGE_VENDOR "The University of California Marching Band Computer Co
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CalChart, the tool to chart shows for the Cal Band.")
 set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
+## Ensure all packaging components are available to CPack on all platforms
+## so that docs and resources are included in created packages (e.g. macOS DragNDrop DMG).
 if(MSVC)
   set(CPACK_COMPONENTS_ALL applications Docs Resources)
 else()

src/CMakeLists.txt

@@ -3,9 +3,21 @@
 # CalChart docs
 file(
   GLOB CalChartDocs
-    "${PROJECT_SOURCE_DIR}/docs/source/*"
+    "${PROJECT_SOURCE_DIR}/docs/*"
 )
 
+# Split CalChartDocs into plain files and directories so we can install them
+# appropriately (install FILES cannot be given directories).
+set(CalChartDocFiles)
+set(CalChartDocDirs)
+foreach(_doc ${CalChartDocs})
+  if(IS_DIRECTORY ${_doc})
+    list(APPEND CalChartDocDirs ${_doc})
+  else()
+    list(APPEND CalChartDocFiles ${_doc})
+  endif()
+endforeach()
+
 file(
   GLOB CalChartResources
     "${PROJECT_SOURCE_DIR}/resources/common/*"
@@ -209,11 +221,25 @@ endif ()
 
 # we add some targets for docs and images so we can pack them for windows
 # see http://yanivresearch.info/software/CPackWindowsTutorial/CPackForWindows.html
-install(
-  FILES ${CalChartDocs}
-  DESTINATION docs
-  COMPONENT Docs
-)
+## Install top-level doc files and the docs/source directory (if present)
+if(CalChartDocFiles)
+  install(
+    FILES
+      ${CalChartDocFiles}
+    DESTINATION docs
+    COMPONENT Docs
+  )
+endif()
+
+# Install any subdirectories found under docs/ (e.g. docs/source)
+foreach(_docdir ${CalChartDocDirs})
+  get_filename_component(_basename ${_docdir} NAME)
+  install(
+    DIRECTORY "${_docdir}/"
+    DESTINATION docs/${_basename}
+    COMPONENT Docs
+  )
+endforeach()
 
 install(
   FILES ${CalChartResources}