From 1d7c5f63dfe9b49c92a8b5ea00fd3b26d8abef10 Mon Sep 17 00:00:00 2001
From: proller <proller@users.noreply.github.com>
Date: Wed, 25 Jan 2017 00:07:08 +0300
Subject: [PATCH] Cmake: fix includes with PATH_SUFFIXES (#389)

---
 cmake/find_icu4c.cmake                       | 2 +-
 cmake/find_readline_edit.cmake               | 4 ++--
 libs/libmysqlxx/cmake/find_mysqlclient.cmake | 2 +-
 libs/libmysqlxx/src/Connection.cpp           | 2 +-
 libs/libmysqlxx/src/Exception.cpp            | 2 +-
 libs/libmysqlxx/src/Pool.cpp                 | 4 ++--
 libs/libmysqlxx/src/Query.cpp                | 2 +-
 libs/libmysqlxx/src/ResultBase.cpp           | 2 +-
 libs/libmysqlxx/src/Row.cpp                  | 2 +-
 libs/libmysqlxx/src/StoreQueryResult.cpp     | 2 +-
 libs/libmysqlxx/src/UseQueryResult.cpp       | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cmake/find_icu4c.cmake b/cmake/find_icu4c.cmake
index bf0d2892d8..49a44bb00c 100644
--- a/cmake/find_icu4c.cmake
+++ b/cmake/find_icu4c.cmake
@@ -11,6 +11,6 @@ else ()
 endif ()
 set (ICU_LIBS ${ICUI18N} ${ICUUC} ${ICUDATA})
 
-find_path (ICU_INCLUDE_DIR NAMES unistr.h PATH_SUFFIXES unicode PATHS ${ICU_INCLUDE_PATHS})
+find_path (ICU_INCLUDE_DIR NAMES unicode/unistr.h PATHS ${ICU_INCLUDE_PATHS})
 message(STATUS "Using icu: ${ICU_INCLUDE_DIR} : ${ICU_LIBS}")
 include_directories (${ICU_INCLUDE_DIR})
diff --git a/cmake/find_readline_edit.cmake b/cmake/find_readline_edit.cmake
index 961196d7c7..d23910155d 100644
--- a/cmake/find_readline_edit.cmake
+++ b/cmake/find_readline_edit.cmake
@@ -20,7 +20,7 @@ if (NOT READLINE_PATHS)
 
 	set(READLINE_INCLUDE_PATHS "/usr/local/opt/readline/include")
 	if (READLINE_LIB)
-		find_path (READLINE_INCLUDE_DIR NAMES readline.h PATH_SUFFIXES readline PATHS ${READLINE_INCLUDE_PATHS})
+		find_path (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS ${READLINE_INCLUDE_PATHS})
 		add_definitions (-D USE_READLINE)
 		set (LINE_EDITING_LIBS ${READLINE_LIB} ${TERMCAP_LIB})
 		message (STATUS "Using line editing libraries (readline): ${READLINE_INCLUDE_DIR} : ${LINE_EDITING_LIBS}")
@@ -31,7 +31,7 @@ if (NOT READLINE_PATHS)
 			find_library (CURSES_LIB NAMES curses)
 		endif ()
 		add_definitions (-D USE_LIBEDIT)
-		find_path (READLINE_INCLUDE_DIR NAMES readline.h PATH_SUFFIXES editline PATHS ${READLINE_INCLUDE_PATHS})
+		find_path (READLINE_INCLUDE_DIR NAMES editline/readline.h PATHS ${READLINE_INCLUDE_PATHS})
 		set (LINE_EDITING_LIBS ${EDIT_LIB} ${CURSES_LIB} ${TERMCAP_LIB})
 		message (STATUS "Using line editing libraries (edit): ${READLINE_INCLUDE_DIR} : ${LINE_EDITING_LIBS}")
 	else ()
diff --git a/libs/libmysqlxx/cmake/find_mysqlclient.cmake b/libs/libmysqlxx/cmake/find_mysqlclient.cmake
index 14a7fc2308..142ed965a6 100644
--- a/libs/libmysqlxx/cmake/find_mysqlclient.cmake
+++ b/libs/libmysqlxx/cmake/find_mysqlclient.cmake
@@ -18,7 +18,7 @@ set (MYSQL_INCLUDE_PATHS
 	"/usr/include/mysql"
 )
 
-find_path (MYSQL_INCLUDE_DIR NAMES mysql.h PATH_SUFFIXES mysql PATHS ${MYSQL_INCLUDE_PATHS})
+find_path (MYSQL_INCLUDE_DIR NAMES mysql/mysql.h PATHS ${MYSQL_INCLUDE_PATHS})
 
 if (USE_STATIC_LIBRARIES)
 	find_library (STATIC_MYSQLCLIENT_LIB libmysqlclient.a PATHS ${MYSQL_LIB_PATHS})
diff --git a/libs/libmysqlxx/src/Connection.cpp b/libs/libmysqlxx/src/Connection.cpp
index 2db721a62e..7f2345dc35 100644
--- a/libs/libmysqlxx/src/Connection.cpp
+++ b/libs/libmysqlxx/src/Connection.cpp
@@ -1,4 +1,4 @@
-#include <mysql.h>
+#include <mysql/mysql.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/Exception.h>
 
diff --git a/libs/libmysqlxx/src/Exception.cpp b/libs/libmysqlxx/src/Exception.cpp
index 50884b907f..c4a11a20bc 100644
--- a/libs/libmysqlxx/src/Exception.cpp
+++ b/libs/libmysqlxx/src/Exception.cpp
@@ -1,4 +1,4 @@
-#include <mysql.h>
+#include <mysql/mysql.h>
 #include <mysqlxx/Exception.h>
 
 
diff --git a/libs/libmysqlxx/src/Pool.cpp b/libs/libmysqlxx/src/Pool.cpp
index 5f55b6b068..f4ae13e2c3 100644
--- a/libs/libmysqlxx/src/Pool.cpp
+++ b/libs/libmysqlxx/src/Pool.cpp
@@ -1,5 +1,5 @@
-#include <mysql.h>
-#include <mysqld_error.h>
+#include <mysql/mysql.h>
+#include <mysql/mysqld_error.h>
 #include <mysqlxx/Pool.h>
 
 #include <Poco/Util/Application.h>
diff --git a/libs/libmysqlxx/src/Query.cpp b/libs/libmysqlxx/src/Query.cpp
index 1efb8744af..9b9229d52c 100644
--- a/libs/libmysqlxx/src/Query.cpp
+++ b/libs/libmysqlxx/src/Query.cpp
@@ -1,4 +1,4 @@
-#include <mysql.h>
+#include <mysql/mysql.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/Query.h>
 
diff --git a/libs/libmysqlxx/src/ResultBase.cpp b/libs/libmysqlxx/src/ResultBase.cpp
index ebe43e62e4..b7fd36b4b4 100644
--- a/libs/libmysqlxx/src/ResultBase.cpp
+++ b/libs/libmysqlxx/src/ResultBase.cpp
@@ -1,4 +1,4 @@
-#include <mysql.h>
+#include <mysql/mysql.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/ResultBase.h>
 
diff --git a/libs/libmysqlxx/src/Row.cpp b/libs/libmysqlxx/src/Row.cpp
index b042961e04..e6ffdb00af 100644
--- a/libs/libmysqlxx/src/Row.cpp
+++ b/libs/libmysqlxx/src/Row.cpp
@@ -1,4 +1,4 @@
-#include <mysql.h>
+#include <mysql/mysql.h>
 #include <mysqlxx/Row.h>
 
 
diff --git a/libs/libmysqlxx/src/StoreQueryResult.cpp b/libs/libmysqlxx/src/StoreQueryResult.cpp
index 16e896c7b9..9a88cfc049 100644
--- a/libs/libmysqlxx/src/StoreQueryResult.cpp
+++ b/libs/libmysqlxx/src/StoreQueryResult.cpp
@@ -1,4 +1,4 @@
-#include <mysql.h>
+#include <mysql/mysql.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/StoreQueryResult.h>
 
diff --git a/libs/libmysqlxx/src/UseQueryResult.cpp b/libs/libmysqlxx/src/UseQueryResult.cpp
index 49b523321d..d015338e41 100644
--- a/libs/libmysqlxx/src/UseQueryResult.cpp
+++ b/libs/libmysqlxx/src/UseQueryResult.cpp
@@ -1,4 +1,4 @@
-#include <mysql.h>
+#include <mysql/mysql.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/UseQueryResult.h>
 
-- 
GitLab