Merge branch 'develop' into MAX-324

2015-02-04 13:01:43 +02:00
parent ab6d90786b 8ac124d649
commit 86bed0541c
93 changed files with 21968 additions and 4054 deletions
--- a/macros.cmake
+++ b/macros.cmake
@ -98,6 +98,7 @@ macro(check_dirs)
  
  if(DEFINED MYSQL_DIR)
 	debugmsg("Searching for MySQL headers at: ${MYSQL_DIR}")
+    list(APPEND CMAKE_INCLUDE_PATH ${MYSQL_DIR})
 	find_path(MYSQL_DIR_LOC mysql.h PATHS ${MYSQL_DIR} PATH_SUFFIXES mysql mariadb NO_DEFAULT_PATH)
  else()
 	find_path(MYSQL_DIR_LOC mysql.h PATH_SUFFIXES mysql mariadb)