Merge with develop

--HG-- branch : compatibility-develop
2016-01-03 19:36:10 +01:00 · 2016-01-03 19:36:10 +01:00 · 9a7d4d3684
commit 9a7d4d3684
parent c9262b01c2 873f4995ce
1 changed files with 1 additions and 0 deletions
--- a/code/CMakeModules/FindMySQL.cmake
+++ b/code/CMakeModules/FindMySQL.cmake
@ -17,6 +17,7 @@ ELSE()

  FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
      PATH_SUFFIXES mysql
+      PATHS
      /usr/include/mysql
      /usr/local/include/mysql
      /opt/local/include/mysql5/mysql