From 5bb6a0ebffa5162b6d1eee1839053ec9bc63e9fd Mon Sep 17 00:00:00 2001
From: "Kent R. Spillner" <kspillner@acm.org>
Date: Tue, 28 Jun 2016 17:45:03 -0400
Subject: [PATCH] Build: Out of source build improvements for holidays, themes

- Using a separate build directory currently fails during make install
  because none of the files under doc/holidays or doc/themes are being
  by cmake into the build dir.  Add CMakeLists.txt files for both
  doc/holidays and doc/themes, and add the corresponding add_subdirectory
  directives to doc/CMakeLists.txt, to ensure these files are always
  copied into the build directory and installed correctly.
---
 doc/CMakeLists.txt          | 7 ++++---
 doc/holidays/CMakeLists.txt | 7 +++++++
 doc/themes/CMakeLists.txt   | 6 ++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 doc/holidays/CMakeLists.txt
 create mode 100644 doc/themes/CMakeLists.txt

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 5a299d58..ec25fdbf 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -2,8 +2,9 @@ cmake_minimum_required (VERSION 2.8)
 
 message ("-- Configuring documentation")
 
+add_subdirectory (holidays)
+add_subdirectory (themes)
+
 configure_file (man/timew.1.in man/timew.1)
 
-install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/             DESTINATION ${TIMEW_MAN1DIR} FILES_MATCHING PATTERN "*.1")
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/themes/          DESTINATION ${TIMEW_DOCDIR}/themes)
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/holidays/        DESTINATION ${TIMEW_DOCDIR}/holidays)
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/ DESTINATION ${TIMEW_MAN1DIR} FILES_MATCHING PATTERN "*.1")
diff --git a/doc/holidays/CMakeLists.txt b/doc/holidays/CMakeLists.txt
new file mode 100644
index 00000000..44e0f4cb
--- /dev/null
+++ b/doc/holidays/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required (VERSION 2.8)
+
+message ("-- Configuring holiday documentation")
+
+install (FILES README         DESTINATION ${TIMEW_DOCDIR}/doc/holidays)
+install (FILES holidays.en-US DESTINATION ${TIMEW_DOCDIR}/doc/holidays)
+install (FILES refresh        DESTINATION ${TIMEW_DOCDIR}/doc/holidays)
diff --git a/doc/themes/CMakeLists.txt b/doc/themes/CMakeLists.txt
new file mode 100644
index 00000000..a954576f
--- /dev/null
+++ b/doc/themes/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required (VERSION 2.8)
+
+message ("-- Configuring theme documentation")
+
+install (FILES README     DESTINATION ${TIMEW_DOCDIR}/doc/themes)
+install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)