From d8d920bdb47b9d02e5be2af8a2a53d5d9a3be903 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Wed, 24 Sep 2014 18:58:23 +0300
Subject: [PATCH] made the searching of MySQL headers look recursively for
 subdirectories

---
 CMakeLists.txt |  8 +++++---
 macros.cmake   | 11 +++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c548d8cbe..1ebbebfce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,9 +55,11 @@ if(GCOV)
 endif()
 
 
-include_directories(${MYSQL_DIR})
-include_directories(${MYSQL_DIR}/private)
-include_directories(${MYSQL_DIR}/extra)
+subdirs(MYSQL_DIR_ALL ${MYSQL_DIR})
+foreach(DIR ${MYSQL_DIR_ALL})
+  include_directories(${DIR})
+endforeach()
+
 include_directories(${MYSQL_DIR}/..)
 include_directories(utils)
 include_directories(log_manager)
diff --git a/macros.cmake b/macros.cmake
index 71a7137a1..57f16b8d0 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -208,3 +208,14 @@ macro(check_dirs)
   endif()
 
 endmacro()
+
+function(subdirs VAR DIRPATH)
+
+  file(GLOB_RECURSE SDIR ${DIRPATH}/*)
+  foreach(LOOP ${SDIR})
+	get_filename_component(LOOP ${LOOP} DIRECTORY)
+	list(APPEND ALLDIRS ${LOOP})
+  endforeach()
+  list(REMOVE_DUPLICATES ALLDIRS)
+ set(${VAR} "${ALLDIRS}" CACHE PATH " " FORCE)
+endfunction()
\ No newline at end of file