From c6f3ce4d397b6fb7b70f8bf555369733280cbcb6 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeff@tomahawk-player.org>
Date: Sat, 11 May 2013 18:49:56 -0400
Subject: [PATCH 1/2] Actually recursively install header files.

---
 cmake/CMakeHelpers.cmake | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake
index 0623237158..411829cbcd 100644
--- a/cmake/CMakeHelpers.cmake
+++ b/cmake/CMakeHelpers.cmake
@@ -17,18 +17,6 @@ macro (print_used_build_config)
     message ("") 
 endmacro ()
 
-# Lists all subdirectories to the RESULT variable.
-macro (list_subdirectories RESULT curdir)
-    set (_TEMP_DIRLIST "")
-    file (GLOB children RELATIVE ${curdir} ${curdir}/*)
-    foreach (child ${children})
-        if (IS_DIRECTORY ${curdir}/${child})
-            set (_TEMP_DIRLIST ${_TEMP_DIRLIST} ${child})
-        endif ()
-    endforeach ()
-    set (${RESULT} ${_TEMP_DIRLIST})
-endmacro ()
-
 # Adds the given folder_name into the source files of the current project. 
 # Use this macro when your module contains .cpp and .h files in several subdirectories.
 # Your sources variable needs to be WSPP_SOURCE_FILES and headers variable WSPP_HEADER_FILES.
@@ -74,16 +62,11 @@ macro (final_target)
     endif ()
 
     # install headers, directly from current source dir and look for subfolders with headers
-    file (GLOB TARGET_INSTALL_HEADERS *.hpp)
-    install (FILES ${TARGET_INSTALL_HEADERS} DESTINATION "include/${TARGET_NAME}")
-    list_subdirectories(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR})
-    foreach (SUBDIR ${SUBDIRS})
-        file (GLOB TARGET_INSTALL_HEADERS_SUBDIR ${SUBDIR}/*.hpp)
-        install (FILES ${TARGET_INSTALL_HEADERS_SUBDIR} DESTINATION "include/${TARGET_NAME}/${SUBDIR}")
-    endforeach ()
-
-    # Pretty printing
-    message ("")
+    file (GLOB_RECURSE TARGET_INSTALL_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.hpp)
+    foreach (hppfile ${TARGET_INSTALL_HEADERS})
+      get_filename_component (currdir ${hppfile} PATH)
+      install (FILES ${hppfile} DESTINATION "include/${TARGET_NAME}/${currdir}")
+    endforeach()
 endmacro ()
 
 macro (link_boost)

From e88b30e94d4c3029d692115ae37af46c1ab877f3 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeff@tomahawk-player.org>
Date: Sun, 12 May 2013 10:26:31 -0400
Subject: [PATCH 2/2] Don't use Doxygen in the standard cmake build dir

---
 Doxyfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Doxyfile b/Doxyfile
index 9c56cf4215..6366a0849d 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -700,7 +700,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                =
+EXCLUDE                = build
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded